Add chages from #1250 to v1-train

v1-train -> Merge.
master -> No.