Merge branch 'jc/maint-add-p-coalesce-fix' into maint