NXP-10080: fix Sonar violations