Fixup for long-running destruction
Check
Merge branch 'master' into dashboard