Yesterday
merge from train_disconnect_fix