Merge "Update TrainInfo and BinaryPushStateChanged atoms"