Merge branch 'jk/maint-add-p-empty' into maint