Fix BC

nicxvanrequested to merge
issue/drupal-3609020:3609020-bc-layer-in into main

Closes #3609020

Merge request reports