Merge branch 'jc/maint-add-p-unquote' into maint