Merge 44257 from amd64 branch: