Merge pull request #2977 from hansva/master

Sonar cleanup