Refs #8502 first four refactor tasks
Refs #8502 rest of refactor tasks
Merge remote-tracking branch 'origin/feature/8502_refactor_indexing'