Update notes for submitted changes

* Merge remote-tracking branch 'gerrit/master' into dev/reorg