Add zone to debug messages
Merge branch 'development'