rerolling against 9.4.x and applying suggestions from comment #14258911 from issue 3181778

Beatriz Rodriguesrequested to merge
issue/drupal-3181778:3181778-replace-t-9.4 into 9.4.x

Closes #3181778

Merge request reports