#2815881: Patch 196 on current main

Jan Kellermannrequested to merge
issue/drupal-2815881:2815881-switching-on-aggregation-main into main

Closes #2815881

Merge request reports