Backport 2950869

Alex Pottrequested to merge
issue/drupal-2950869:2950869-10.x into 10.6.x

Closes #2950869

Merge request reports