NXP-13141: fix sonar violations