Merge branch 'partitionedIndex'