fixed from UpdateHot5
Merge branch 'GetAgChanges2' into WBMaster3