Merge remote-tracking branch 'origin/1.12'
Merge remote-tracking branch 'origin/master' into features/sonar-cleanup