NXP-13291: Change public API