Applied #70 by @ndewhurst

Julian Pustkuchenrequested to merge
issue/drupal-2999370:11.x into 11.x

Merge request reports