Merge "Adding SONAR fixes for"