NXP-12226: explicit save