Implement sandwich note feature
Merge remote-tracking branch 'origin/master'
Implement sandwich note feature