commit initial fix; need to add hooks for region to zone id
(cherry picked from commit cb5961d1fa64a45cbec5ef5d677b57f8d62f50b5)
commit initial fix; need to add hooks for region to zone id
(cherry picked from commit cb5961d1fa64a45cbec5ef5d677b57f8d62f50b5)