Resolve #3621326 "11.x"

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

Closes #3621326

Merge request reports