Update notes for submitted changes

* Merge branch 'bhv-1252-category' into master