merge 46805 from amd64 branch: