Merge "TrainInfo persist onto disk"