Merge branch 'jc/apply-binary-p0' into maint-1.7.11