Update notes for submitted changes

* Backport to 4.0 following issues: