SSP-797 - stability fixes for save/load plan