Merge "Update sonar settings"