Merge "Update sonar config"