Added 26570
Fixes to last nights regression tests
Merge pull request #256 from roydude/v1-train

v1train