Merge "Add support for RS in C++."