NXP-12385: follow Sonar recommandations