don't need to conj pipelines anymore.
Fold test is passing.
Merge remote-tracking branch 'origin/tp3' into tp3