To allow easier discussions about the fixes create a new branch to only contain the 64-Bit specific fixes.