Merge "Fixed Sonar blocker issues"