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