Merge "Add a feature flag for CTS." into oc-dev