Update notes for submitted changes

* Cherry-pick 3 commits