Update notes for submitted changes

* Finish BEP-test-fix cherry-pick