Merged all notes
Merge pull request #1646 from sbt/wip/0137-notes

Merged all notes