Merge branch 'jc/apply-binary-p0' into next