Merge "Added sonar fixes"