NXP-11921: Follow changes