Merge "Fix LM deadlock possibility"