Added availability zone parameter
Merged prod