Update notes for submitted changes

* Cherry-pick new commits from master branch: