* commit '78db850049b2312a82f408373d22c83c5ad8fa56': Synchronize access to Locked methods. DO NOT MERGE