Don't loose routes in managed PD
Merge remote-tracking branch 'upstream/master'