merge 37282 from amd64-branch: