Merge branch 'nd/index-pack-threaded-fixes'