MAGETWO-64547: Bundle Products - The options you selected are not available

Author: Dmytro Voskoboinikov

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

@@ -143,14 +143,16 @@ protected function _getSelectedOptions()
     {
         if (is_null($this->_selectedOptions)) {
             $this->_selectedOptions = [];
+
+            /** @var \Magento\Bundle\Model\Option $option */
             $option = $this->getOption();
 
             if ($this->getProduct()->hasPreconfiguredValues()) {
-                $configValue = $this->getProduct()->getPreconfiguredValues()->getData(
+                $selectionId = $this->getProduct()->getPreconfiguredValues()->getData(
                     'bundle_option/' . $option->getId()
                 );
-                if ($configValue) {
-                    $this->_selectedOptions = $configValue;
+                if ($selectionId && $option->getSelectionById($selectionId)) {
+                    $this->_selectedOptions = $selectionId;
                 } elseif (!$option->getRequired()) {
                     $this->_selectedOptions = 'None';
                 }

app/code/Magento/Bundle/Model/LinkManagement.php

@@ -308,7 +308,6 @@ public function removeChild($sku, $optionId, $childSku)
                     continue;
                 }
                 $excludeSelectionIds[] = $selection->getSelectionId();
-                $usedProductIds[] = $selection->getProductId();
             }
         }
         if (empty($removeSelectionIds)) {