NXP-16003: follow changes