merge conflict in Bug #859555
Merge pull request #9992 from michalbe/v1-train-merge

merge conflict in Bug #859555