NXP-13587: follow core changes