OPENUCB-316: Patch 'migrate' to support Blocks.