Resolve #3633173

Jessrequested to merge
issue/drupal-3633173:3633173-main into main

Closes #3633173

Merge request reports