Combined two related critical sections
Merge branch 'routing' of https://github.com/kutagh/NetChange into routing