Merge branch 'tl/notes-separator'