Update core
Merge, Update blocks