Refactoring routes per issue #1100
Merge branch 'develop' into route
Merge branch 'develop' into route
Merge branch 'develop' into route
Route refactoring in process
Merge branch 'develop' into route
Finishing route refactoring: compatible with module clone
Route for module clone per #1018, #1100
Fix route for module clone