Merge pull request #174 from roydude/v1-train

v1train
Merge pull request #175 from roydude/v1-train

Unblocked 26877.
Removed merge conflict info from 26997