NXP-11692: fix forward-port due to NXP-10022 changes