follow changes on 5.7.2 (NXP-10598, NXP-12157)