Merge all changes from xs64bit to master