Resolve #2916876 "10.1.x"

Rolando Payán Mosquedarequested to merge
issue/drupal-2916876:2916876-10.1.x into 10.1.x

Closes #2916876

Merge request reports