The goal is to have all tricky/involved merge conflicts resolved before the massive renaming Branches to merge `main` into: - `feature/abci++vef` (#102) - `feature/adr075-backport` (#106)