Issue 900399 v1 train (cherry picked from commit 2cae0622ee942906daaca90293441afdbd2cb7de)