Update notes for submitted changes

* Cherry-pick commits from release-0.4