Add macro twig but currently not used
Merge from upstream