EZP-22152: NS fixes
EZP-22152: Removed twig templates HTML comments debugging