Closes https://gitlab.cern.ch/webservices/webframeworks-planning/-/issues/937
Part of https://gitlab.cern.ch/webservices/webframeworks-planning/-/issues/938