Merge branch '2323-player-locking'