Added availability zone parameter
Merge branch 'prod'