NXP-16212: more refactor