Update.

Dave Longrequested to merge
issue/drupal-3561212:3561212-10.6.x into 10.6.x

Closes #3561212

Merge request reports