Merge branch 'jk/pack-name-cleanups' into maint