Merge branch 'perf_index' into release
Merge branch 'project-string' into release
Merge branch 'correct_inner_index' into release
Merge branch 'mapreduce' into release
record merge resolution