Merge branch 'jk/pack-tag-of-tag' into maint