Merge "Remove Mutex dependency from MemMap"