Merge "Introduce a BlockManager service"