Merge branch 'jh/notes-merge'