Originally created by @segfault on #16624 (Redmine)
Feature Branch: bugfix/16624-fix-automatic-suspend