Merge "LockManagerGroup tweaks"