Merge pull request #9917 from askeing/v1-train

Merge pull request #9777 from askeing/Bug_867031