Merge "Support RCS master switch"