Fixing precedence of routes
Merge remote-tracking branch 'upstream/master'