Update notes for submitted changes

* Align tree and complete rebase on top of CM tree.