aaronpowell Merge branch 'brettz9-multisegment-indexes'