Update notes for submitted changes

* Merge master into ec feature branch
Update notes for submitted changes

* Just a tiny doc fix for a Sphinx warning