Merge "Fix for Sonar critical issues"