Merge "Critical Sonar bug fix"