[SONARFIXES] Fixed sonar blocker issues