Merge branch 'mm/maint-add-p-quit'