Merge from main/train_tunnels_new_content/bypass_tunnels/new_content/train_tunnels_bypass/making_this_up_as_i_go/console_version