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

27002 and 28100 unblocked
26317 26979 26980 26982 unblocked