Merge pull request #12417 from evelynhung/issue-900399

Issue 900399 v1 train (cherry picked from commit 2cae0622ee942906daaca90293441afdbd2cb7de)
(cherry picked from commit 7ddf9a8d3826c07b5bf303a3501dbe969d3c5727)
Merge pull request #12697 from evelynhung/issue-900399-v1.2

Merge pull request #12417 from evelynhung/issue-900399