Merge branch 'mh/notes-duplicate-entries'