Merge "Fix for Sonar issues"