Blocked 26317 26979 26980 26982 again.
Merge pull request #158 from roydude/v1-train

Blocked 26317 26979 26980 26982 again.