NXP-12742: fix sonar violations