ECMS-5616 fix sonar violations