Refactor suspend & resume

Closed username-removed-815437 requested to merge (removed):master into master