Fixes https://gitlab.cern.ch/webservices/webframeworks-planning/-/issues/869 Fixes https://gitlab.cern.ch/webservices/webframeworks-planning/-/issues/845