fix broken ut
Merge branch 'master' into az