Use function arguments for route setup. Upstream-commit: 480d1b841fd238788b75f31cd8ebe0b3a84f8eec Component: engine