Update notes for submitted changes

* (unstable) [merge] aibt into unstable