Update notes for submitted changes

* Merge feature/merged2to1 into master