Merge "Add support for multi train logging"