PIM-3141: Twig modifications