Merge branch 'bp/refresh-index-using-preload'