merge from master to recover diff for pause/resume.