moving patch from https://www.drupal.org/project/rigel/issues/3383326

Closes #3475686

Merge request reports

Loading