Merge xs64bit to master