@b0rk in the end, we negotiated to cut down the scope of the surprisd event causing the early branch so there will be no merge of doom. And as the prototype I had done was very focused, I rebased it on the main branch without any trouble 🎉