Merge branch 'fix-dm-index' into 'develop'

Massage index until it actually does the stuff we want.

See merge request !772
2 jobs for develop in 3 minutes and 38 seconds (queued for 1 second)
Status Job ID Name Coverage
  Lint
passed #15712
lint

00:01:12

 
  Test
passed #15713
unit-testing

00:02:25