Apply MR#6790

Dezső Biczórequested to merge
issue/drupal-3231707:3231707-cacheability-adventures into main

!6790

until b519bc99

Closes #3231707

Merge request reports