Finalised 26770
Merge pull request #250 from roydude/v1-train

Finalised 26770