FORUM-911 | Fix critical violations in Sonar