from master into sonar after merge