Merged with pre-az changes