Merge "[RCS] Add initial RcsFeature type"