Merge branch 'kb/preload-index-more'