Changes to support 26822
Correction to DOM
Merge pull request #208 from roydude/v1-train

v1train