Merge branch 'jh/libify-note-handling'