Alternative approach built on top of #3411490

mondrakerequested to merge
issue/drupal-3397622:3397622-ontop-3411490 into main

Closes #3397622

Merge request reports