Merge "sonar critical for Design"