Merge branch 'hotfix/sonarUpdate' into release/3.9.1

* hotfix/sonarUpdate:
  updates sonar plugin to 3.6