* reorg

* notes

* Update upcoming-release-notes/2153.md

Co-authored-by: DJ Mountney <david.mountney@twkie.net>

* merge fixes

* fix

* another

* f

---------

Co-authored-by: DJ Mountney <david.mountney@twkie.net>