Merge "refactor(cm): unify RMM context" into integration