Trying to fix sonar plugin
Merge branch 'master' into 2.0