NXP-15159 avoid breaking API