NXP-12508: fix Sonar violations