Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1