Resolve #3362713 "10.3"

Jan Kellermannrequested to merge
issue/drupal-3362713:3362713-10.3 into 10.3.x

Closes #3362713

Merge request reports