merge mmgr changes