Merge "Fix reentry deadlock in LMS"