#3524738 backport without deprecation

Jessrequested to merge
issue/drupal-3524738:3524738-11.2.x into 11.2.x

11.2.x backport version of #3524738 without deprecation

Closes #3524738

Merge request reports