Part fix for https://gitlab.cern.ch/webservices/webframeworks-planning/-/issues/692
Requires: cern-drupal-distribution!50 (merged)