merge for deploy router refactoring for Express 4 migration