Partial https://gitlab.cern.ch/webservices/webframeworks-planning/-/issues/848
This MR doesn't cover the internal URL part of the issue.