NXP-11992: follow id changes