NXP-14810: follow changes