merge r43777 from amd64 branch