Merged mblock work-in-progress from eb/mb -r4341:4633 into trunk.