Merge branch 'pv/maint-add-p-no-exclude' into maint