We made changes and even though we didn’t manage to completely end-to-end test with packages, we feel confident enough to merge:
Goal is to get this all stable before the holidays, which for some means it needs to happen this week.
