Merge r44143 from amd64 branch