Merge "Sonar - Major blocker issue fix"