Resolve #3633166 "Main"

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

Closes #3633166

Merge request reports