Merge "Fixed latest Sonar blocker issues"