Addresses https://gitlab.cern.ch/webservices/webframeworks-planning/-/issues/1427 & https://gitlab.cern.ch/webservices/webframeworks-planning/-/issues/1273