NXP-12644: fix Sonar violations