Update notes for submitted changes

* Merge release-5-0 into master