Refs #8502 rest of refactor tasks
Merge branch 'feature/8502_refactor_indexing' into develop