Merge branch 'jk/notes-dwim-doc' into maint