Update notes for submitted changes

* Merge branch 'master' into stable/grizzly