fix concat::setup (#5503)
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop