Better handling of shutdown and zone door/console.
Merge branch 'test' into dev