Merge pull request #1250 from bebef1987/ftu_todo

Ftu fix and xfail
Merge pull request #1254 from teodosia/add1250tov1-train

Add chages from #1250 to v1-train