Fixed route candidate route.
Merge branch 'c1moore_branch' into dev