Merge from amd64-branch: