Merge pull request #1098 in master
Fix design for note
Merge pull request #1099
Merge pull request #1099 in develop