Merge "Change rc undershoot/overshoot semantics"