Merge pull request #25 from roydude/v1-train

Took thread removal out of 19420 (not necessary and sometimes fails).
Merge pull request #26 from roydude/v1-train

19392 adjustment.
19409 fixed.