NXP-12226: explicit save
NXP-12226: debugging for failing test