Resolve #3595089 "Extra"

quietonerequested to merge
issue/drupal-3595089:3595089-extra into main

Closes #3595089

Merge request reports