Merge "Remove Sonar issues"