Resolve #3590364 "Part 2 of"

Mike Herchelrequested to merge
issue/drupal-3590364:3590364-part-2-of into main

Closes #3590364

Merge request reports