Blocked 19224 and 19230
Merge pull request #58 from roydude/v1-train

Blocked 19224 and 19230