NXP-16212: save work in progress