Merge "Adding SONAR fixes for"

No match.