multi-z update
Merge branch 'Multi-z' of https://github.com/yashaldie/NSS-Phoenix into Multi-z
Revert "multi-z update"

This reverts commit 96e040173e17170e6ef367c6218281a5085f3728.