Unblocked bug 897437
Merge pull request #205 from roydude/v1-train

Unblocked bug 897437
Merge pull request #204 from b-paloma/v1-train

26867 done
26868 done