Merge "Make it possible to register/unregister players as a stack" into main