Merge branch 'jk/notes-merge-from-anywhere'