[WIP][BUGFIX] Invalid MM references in workspace context

Change-Id: Idb043d520c30f15e85d54a016e52690f5f05cedc