Merge branch 'jh/add-index-entry-optim'