Merge pull request #1083 from dell/usr/saksham/sonar_fixes