Merge "critical sonar fix"