Initial work for a split index
Enable expiring thread
Merge branch 'split-index'