Merge "Fixed Sonar issues"