Merge branch 'rum-index' into 'develop'