NXP-14996: Refactoring.