Merge branch 'note'