Resolve #3366561 "11.x"

Alex Pottrequested to merge
issue/drupal-3366561:3366561-11.x into 11.x

Closes #3366561

Merge request reports