Merge "Fixed Sonar Issues"