Merge "fix some sonar issues"