Draft: Resolve #1484174

Ivan Berdinskyrequested to merge
issue/drupal-1484174:1484174- into main

Closes #1484174

Merge request reports