Merge branch 'sprint_delhi' into 'master'

[RELEASE] Sprint delhi

Closes #172 and #171

See merge request !20
1 job for master in 6 minutes and 31 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Build
passed #66244
build

00:06:31