Merge "Fix for Sonar major issues"