Code

Merge branch 'nd/index-pack-no-recurse'