Update notes for submitted changes

* Cherry-pick the following commits from master: