Update notes for submitted changes

* Merge tag 'cherry-picked-master-3' into dev/reorg