Merge "Fix for sonar critical issues."