Merge branch 'jh/empty-notes'