Merge pull request #134 from roydude/v1-train

Added 26978
26977 updated
Merge pull request #135 from b-paloma/v1-train

26977 updated
Merge pull request #136 from roydude/v1-train

v1train
Improved 26352