better handling of shut down zones.
Merge branch 'test' into dev