Resolve #2916876 "10.4.x"

Pavel Rubanrequested to merge
issue/drupal-2916876:2916876-10.4.x into 10.4.x

Closes #2916876

Merge request reports