[Fixes #46128275] Rationalize the routes and actions