Merge in RC cost rationalization code (there is a small possibility this change doesn’t get into the HF if we encounter too many issues in the next couple of days).

Is this something to do with RC delegation? If so, I'm getting worried...