@bleu hi!
FYI
About M3: looks like the most part was made via this PR, check it out, please, it’s been just merged into develop.
Also there is a yarn → pnpm migration in the develop branch.
You should better merge it into your local branch to get rid of future conflicts.