Merge "fix sonar clumsy issues"