Merge "Fix addRoute replace default route unexpectedly"