Merge pull request #196 from b-paloma/v1-train

26873 done
26872 and 26871 done