Issue #11354 Merged CSS file name generation

lib/internal/Magento/Framework/View/Asset/Merged.php

@@ -40,6 +40,11 @@ class Merged implements \Iterator
      */
     protected $contentType;
 
+    /**
+     * @var StorageInterface
+     */
+    private $versionStorage;
+
     /**
      * @var bool
      */
@@ -56,11 +61,13 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         MergeStrategyInterface $mergeStrategy,
         \Magento\Framework\View\Asset\Repository $assetRepo,
+        \Magento\Framework\App\View\Deployment\Version\StorageInterface $versionStorage,
         array $assets
     ) {
         $this->logger = $logger;
         $this->mergeStrategy = $mergeStrategy;
         $this->assetRepo = $assetRepo;
+        $this->versionStorage = $versionStorage;
 
         if (!$assets) {
             throw new \InvalidArgumentException('At least one asset has to be passed for merging.');
@@ -116,6 +123,12 @@ private function createMergedAsset(array $assets)
             $paths[] = $asset->getPath();
         }
         $paths = array_unique($paths);
+
+        $version=$this->versionStorage->load();
+        if ($version) {
+            $paths[]=$version;
+        }
+
         $filePath = md5(implode('|', $paths)) . '.' . $this->contentType;
         return $this->assetRepo->createArbitrary($filePath, self::getRelativeDir());
     }