Merge pull request #9 from roydude/v1-train

Fixed 19193.
Test 6002 blocked by bug 879843