diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md
index 932394bdc1c3..09b80d757505 100644
--- a/.github/ISSUE_TEMPLATE/1_Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/1_Bug_report.md
@@ -7,6 +7,7 @@ about: Report errors and problems
 
 | Subject        | Details                                                      |
 | :------------- | :----------------------------------------------------------- |
+| Rector version | e.g. v0.5.15 (invoke `vendor/bin/rector --version`)          |
 | PHP version    | e.g. PHP 7.3 (invoke `php -v`)                               |
 | Full Command   | e.g. vendor/bin/rector process /src --set dead-code --debug  | 
 
@@ -20,4 +21,10 @@ about: Report errors and problems
 <!-- if possible, always run Rector on specfic file, that causes the error -->
 <!-- e.g. vendor/bin/rector process /src/SpecificFile.php --set dead-code --debug -->  
 
+```php
+<?php 
+
+// put file content here
+```
+
 ## Expected Behaviour
diff --git a/packages/BetterPhpDocParser/src/PhpDocNode/Sensio/SensioTemplateTagValueNode.php b/packages/BetterPhpDocParser/src/PhpDocNode/Sensio/SensioTemplateTagValueNode.php
index d82d5966743e..5acdc987db51 100644
--- a/packages/BetterPhpDocParser/src/PhpDocNode/Sensio/SensioTemplateTagValueNode.php
+++ b/packages/BetterPhpDocParser/src/PhpDocNode/Sensio/SensioTemplateTagValueNode.php
@@ -23,20 +23,20 @@ final class SensioTemplateTagValueNode extends AbstractTagValueNode
     private $template;
 
     /**
-     * @var mixed[]
+     * @var mixed[]|null
      */
-    private $owner = [];
+    private $owner;
 
     /**
-     * @var mixed[]
+     * @var mixed[]|null
      */
-    private $vars = [];
+    private $vars;
 
     /**
-     * @param mixed[] $owner
-     * @param mixed[] $vars
+     * @param mixed[]|null $owner
+     * @param mixed[]|null $vars
      */
-    public function __construct(?string $template, array $owner, array $vars)
+    public function __construct(?string $template, ?array $owner = null, ?array $vars = null)
     {
         $this->template = $template;
         $this->owner = $owner;
diff --git a/packages/Sensio/src/Helper/TemplateGuesser.php b/packages/Sensio/src/Helper/TemplateGuesser.php
index 4159b04716b7..610105fff6c9 100644
--- a/packages/Sensio/src/Helper/TemplateGuesser.php
+++ b/packages/Sensio/src/Helper/TemplateGuesser.php
@@ -8,6 +8,10 @@
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\Node\Resolver\NameResolver;
 
+/**
+ * @see \Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\TemplateAnnotationVersion3RectorTest
+ * @see \Rector\Sensio\Tests\Rector\FrameworkExtraBundle\TemplateAnnotationRector\TemplateAnnotationVersion5RectorTest
+ */
 final class TemplateGuesser
 {
     /**