Apply patch

Dearequested to merge
issue/flag-3294851:3294851-flag-count-twig-template into 5.x

Merge request reports