Merge "fix critical sonar"