cherry-pick notes
Merge branch 'develop'

* develop:
  cherry-pick notes