Merge branch 'dsl2' into 'dev'

Merge dsl2 in dev to finalize dsl1 to dsl2 transition

See merge request !12
2 jobs for dev