SSP-677 Save and Cancel consistency

This is a cherry-pick of 485130a9cfc034d6302811266487b52943dded73