Merge branch 'sb/notes-parse-opt'