Fix dev-build routes
Merge branch 'fix-dev-build'