NXP-16052: Follow changes