Commit part of FS#11748 by Michael Hohmuth. Adds support for automatically resuming...