Merge branch 'mm/add-p-quit'