D 10.4

Claudiu Cristearequested to merge
issue/drupal-2320877:2320877-10.4 into 10.4.x

Closes #2320877

Merge request reports