Update notes for submitted changes

* Cherry pick from master branch