FORUM-991 | Fix critical violations in Sonar
FORUM-991 | Fix critical violations in Sonar
Merge commit 'ff17ee02fcbb420bd5b7e6e479e104c35b0d50b9' into HEAD