11.x backport

catchrequested to merge
issue/drupal-3608912:3608912-11x into 11.x

Closes #3608912

Merge request reports