24958:reserveOnSave enhancements