Fixed 26412 and 26550 following ci build errors.
Merge pull request #240 from roydude/v1-train

Fixed 26412 and 26550 following ci build errors.