Bring back the concat::setup
Merge branch 'concat'