Added better checks and logging for zdoor code.
Added better checks and logging for zdoor code.
Merge branch 'test' into dev