Draft: POC compat with #2664570

Florent Torregrosarequested to merge
issue/drupal-3631504:3631504-poc-compat-2664570 into main

Take comment !13379 (comment 2752365) into account

Closes #3631504

Merge request reports