Merge branch 'np/fast-import-idx-v2' into maint