XX-9767 PT-336655 Multiple zones in a cluster - various fixes