routes fix
Merge branch 'release/routes_fix'