Bug 89738 fixed, so unblocked 26317 26979 26980 26982.
Merge pull request #157 from roydude/v1-train

Bug 897398 fixed, so unblocked 26317 26979 26980 26982.