Merge "Fix for Sonar Blocker issues"