Revert "SONAR-4201"
Merge remote-tracking branch 'origin/master'