Merge 2/2 Revert Backport and Revert suspend/resume support