AMI change for EZID from release-1.10

Merge Eric's change for EZID from release-1.10