Bring back in cLock from CM-10.1