Merge branch 'mh/notes-tree-consolidate-fix'