NXP-12654: refactor