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

26977 done but blocked
blocked_tests updated