Merge "Fixed recent Sonar blocker issues"