Merge four changesets from master to xs64bit