Hand merged routing and rudp.
Merge remote-tracking branch 'origin/next' into next_ned14