Merge "Sonar critical issues"