Update notes for submitted changes

* Merge branch 'stable/essex' into stable/folsom-essex-merge