reset queue exit context to null where it make sense
update down_revision
Merge branch '5353-queue-exit-context'