Sponge: Update for latest API changes
Merge branch '5.0' into feature/5.0-game-registry