Issue #20044 Add new routes.
issue #20044: Lots of fixes, linting other clean up.