Merge "Quick fix for possible deadlock in LMS" into rvc-dev