and some other de-tenant changes, including removing the controller tenanting concerns
https://app.fizzy.do/5986089/cards/2814