Merge "Fix CME crashes" into rvc-dev