NXP-12945: fix sonar violations