Merge branch 'feature/issue30-consider-slots-dse' into develop

72 jobs for develop in 192 minutes and 56 seconds (queued for 3 seconds)