Merge branch 'jc/maint-unpack-objects-strict' into maint