Merge "sonarcloud support"