Merge branch 'jn/notes-doc'