merged in mblock work-in-progress