Merge "DO NOT MERGE Move LMS to ease merge conflicts" into rvc-dev