Deploy Az's changes

Deploy Az's changes