Merge "blocker sonar fix"