Merge "Remove RCS columns for a feature that was never implemented"