Merge xs64bit into master