Merge "add RS CPP CTS tests." into klp-dev