diff --git a/app/code/Magento/PageCache/etc/varnish.vcl b/app/code/Magento/PageCache/etc/varnish.vcl
index 4b2a337ba321fe2498965857456c7acc44f0c38c..2b90ee0e3ef14cb62ec4c038855bc8ae27b90d44 100644
--- a/app/code/Magento/PageCache/etc/varnish.vcl
+++ b/app/code/Magento/PageCache/etc/varnish.vcl
@@ -46,6 +46,18 @@ sub vcl_recv {
     if (req.request != "GET" && req.request != "HEAD") {
         return (pass);
     }
+    
+    # normalize url in case of leading HTTP scheme and domain
+    set req.url = regsub(req.url, "^http[s]?://[^/]+", "");
+
+    # collect all cookies
+    std.collect(req.http.Cookie);
+
+    # static files are always cacheable. remove SSL flag and cookie
+    if (req.url ~ "^/(pub/)?(media|static)/.*\.(png|jpg|jpeg|gif|css|js|swf|ico|woff|svg)$") {
+        unset req.http.Https;
+        unset req.http.Cookie;
+    }
 
     set req.grace = 1m;
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample
index 1281407baeec07a22e0235d043d50b8bdb94a5d6..afecd37b4f60b92551c271fca5365c4483c11187 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample
@@ -2,7 +2,7 @@
 namespace Magento\Framework\Code\GeneratorTest;
 
 /**
- * Factory class for Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
+ * Factory class for @see \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
  *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
index 99aa37fdd6361230ad1fd76a7bc852822774bcee..2b9106f61386e9e56b47e5d3a419a7ba467bc364 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
@@ -2,7 +2,7 @@
 namespace Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace;
 
 /**
- * Proxy class for Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
+ * Proxy class for @see \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
  *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleBuilder.txt b/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleBuilder.txt
index cd38526a0242951d97bcc9f403e121e6e3f37a24..147361604dce53b339f65b5c88a4b58244a36e6c 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleBuilder.txt
+++ b/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleBuilder.txt
@@ -1,7 +1,7 @@
 namespace \Magento\Framework\Api\Code\Generator;
 
 /**
- * Builder class for \Magento\Framework\Api\Code\Generator\Sample
+ * Builder class for @see \Magento\Framework\Api\Code\Generator\Sample
  */
 class SampleBuilder extends \Magento\Framework\Api\ExtensibleObjectBuilder
 {
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleMapper.txt b/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleMapper.txt
index b022751c544ea0dfbf774fed44ff1e0642ce1ec3..7ec692fc3fd5b7dc1d7ca21d1643e4ceff7c92a2 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleMapper.txt
+++ b/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleMapper.txt
@@ -1,7 +1,7 @@
 namespace \Magento\Framework\Api\Code\Generator;
 
 /**
- * Mapper class for \Magento\Framework\Api\Code\Generator\Sample
+ * Mapper class for @see \Magento\Framework\Api\Code\Generator\Sample
  */
 class SampleMapper
 {
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleSearchResultsBuilder.txt b/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleSearchResultsBuilder.txt
index 96578961ade1fcb36bbeee70a249a9c31e18ec9f..29c9f9959380dc2de101d82b34116baa3d8dcd83 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleSearchResultsBuilder.txt
+++ b/dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/_files/SampleSearchResultsBuilder.txt
@@ -1,7 +1,7 @@
 namespace \Magento\Framework\Api\Code\Generator;
 
 /**
- * SearchResultsBuilder class for \Magento\Framework\Api\Code\Generator\Sample
+ * SearchResultsBuilder class for @see \Magento\Framework\Api\Code\Generator\Sample
  */
 class SampleSearchResultsBuilder extends \Magento\Framework\Api\AbstractSearchResultsBuilder
 {
diff --git a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Code/Generator/_files/SampleFactory.txt b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Code/Generator/_files/SampleFactory.txt
index dc00737ddd353447c1768de2ce333462dfcb4fb9..26a55f7af986fbccd10212a7101d0df406cd8584 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Code/Generator/_files/SampleFactory.txt
+++ b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Code/Generator/_files/SampleFactory.txt
@@ -1,7 +1,7 @@
 namespace \Magento\Framework\ObjectManager\Code\Generator;
 
 /**
- * Factory class for \Magento\Framework\ObjectManager\Code\Generator\Sample
+ * Factory class for @see \Magento\Framework\ObjectManager\Code\Generator\Sample
  */
 class SampleFactory
 {
diff --git a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Code/Generator/_files/SampleProxy.txt b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Code/Generator/_files/SampleProxy.txt
index 927e954a58f3577095af675ba3fac581d52e9d0e..525394b0c8e18fe3e6635b19cd10fa6d727c2797 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Code/Generator/_files/SampleProxy.txt
+++ b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Code/Generator/_files/SampleProxy.txt
@@ -1,7 +1,7 @@
 namespace \Magento\Framework\ObjectManager\Code\Generator;
 
 /**
- * Proxy class for \Magento\Framework\ObjectManager\Code\Generator\Sample
+ * Proxy class for @see \Magento\Framework\ObjectManager\Code\Generator\Sample
  */
 class Sample_Proxy extends \Magento\Framework\ObjectManager\Code\Generator\Sample
 {
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index 793323f4d143882b36a7a4c5c13a1e6cb58a3e6e..7ef142cc59d0e7f666429bd7b5785b1232682f85 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -291,7 +291,7 @@ abstract class EntityAbstract
      */
     protected function _getClassDocBlock()
     {
-        $description = ucfirst(static::ENTITY_TYPE) . ' class for \\' . $this->_getSourceClassName();
+        $description = ucfirst(static::ENTITY_TYPE) . ' class for @see \\' . $this->_getSourceClassName();
         return ['shortDescription' => $description];
     }