Update notes for submitted changes

* Cherry-pick changes from master