Merge 46523 from amd64 branch: