Update sonar config
Merge branch 'master' into feature/v0.9