Update notes for submitted changes

* Revert "m7: Change inherit order"