Change to use new rc override support in the API