Resolve #3398534 "11.x"

Dave Longrequested to merge
issue/drupal-3398534:3398534-11.x into 11.x

Closes #3398534

Merge request reports