Merge "Fix for Sonar blocker issues"