Update notes for submitted changes

* Merge release-4-6 into release-5-0