Merge branch 'ab/perf-remove-index-lock'