Update notes for submitted changes

* backport fixes to upstream