Merged mblock work-in-progress (eb/mb r4273:4312) into trunk.