Merge "fix critical sonar bugs"