Merge branch 'mg/show-notes-doc'