Merge branch 'pb/complete-and-document-auto-merge-and-friends'