Bunch of upgrades to blocks
Merge branch 'migration' of https://github.com/Katalliaan/Rubedo.git into migration