NXP-11433: fix Sonar violations