Sonar cleanup.
thinko
Merge remote-tracking branch 'origin/master' into features/sonar-cleanup