Merge branch 'jc/maint-1.6.0-keep-pack' into maint