Merge with Maxim

scripted indexes redesign