Merge branch 'sh/enable-preloadindex'