Resolve #3633176

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

Closes #3633176

Merge request reports