Comment 1 for bug 1871166

This looks good, though this is quite a lot of code changes (and refactoring) for a bug without a clear reproduction scenario. Would it be possible to, along with the verification to be done by the reporting person, perform some sanity runs to make sure the cancel/cleanup parts of the code did not regress? Thanks!