merge need_save_resume patch from RC_0_16