Update notes for submitted changes

* Cherry-pick following commits from master: