NXP-14116: Follow changes