Merge upstream multiplayer fixes