Merge branch 'yuwei' into note
Merge branch 'note'