Rerolled MR 2320877-9.3.x for 9.4

Jan Steffenrequested to merge
issue/drupal-2320877:2320877-9.4.x into 9.4.x

Closes #2320877

Merge request reports