Merge branch 'cm/notes-comment-fix'