WIP: Move master unbinding to 'cleanup' event.
Merge branch 'wip-cleanup-event' into dependency-filtering