Merge "Fix addRoute replace default route unexpectedly" into rvc-dev