Server events corrections
Game corrections
Merge commit '2a475194d08c24f0f8098bb1f1d7bc298732eb68'