Merge branch 'jk/index-pack-threading-races' into maint