Merge branch 'jk/notes-merge-config'