Merge pull request #361 from dlobue/dominic/indexing_perf_enhancements

Dominic/indexing perf enhancements
Merge branch 'master' into rax-stage