Merge branch 'gp/pack-refs-remove-empty-dirs' into maint