Merge branch '4479_console_players'