Draft: Resolve #3496257 "2500"

catchrequested to merge
issue/drupal-3496257:3496257-2500 into main

Closes #3496257

Merge request reports