Fixed routing bug
Merge branch '4.3'