diff --git a/app/code/Magento/Catalog/Block/Product/AwareInterface.php b/app/code/Magento/Catalog/Block/Product/AwareInterface.php
index cd1475d029cc6..37c9111c709e7 100644
--- a/app/code/Magento/Catalog/Block/Product/AwareInterface.php
+++ b/app/code/Magento/Catalog/Block/Product/AwareInterface.php
@@ -7,6 +7,8 @@
 
 /**
  * Class Product Aware interface
+ *
+ * @api
  */
 interface AwareInterface
 {
diff --git a/app/code/Magento/Catalog/Block/Product/ReviewRendererInterface.php b/app/code/Magento/Catalog/Block/Product/ReviewRendererInterface.php
index 6fc118d97cb32..64c061abb66a3 100644
--- a/app/code/Magento/Catalog/Block/Product/ReviewRendererInterface.php
+++ b/app/code/Magento/Catalog/Block/Product/ReviewRendererInterface.php
@@ -9,6 +9,7 @@
 /**
  * Interface \Magento\Catalog\Block\Product\ReviewRendererInterface
  *
+ * @api
  */
 interface ReviewRendererInterface
 {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerInterface.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerInterface.php
index 002f2a3886ae9..0e68670a71174 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerInterface.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/HandlerInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\HandlerInterface
  *
+ * @api
  */
 interface HandlerInterface
 {
diff --git a/app/code/Magento/Catalog/Controller/Product/View/ViewInterface.php b/app/code/Magento/Catalog/Controller/Product/View/ViewInterface.php
index 8741eb41053da..e19a6eae31746 100644
--- a/app/code/Magento/Catalog/Controller/Product/View/ViewInterface.php
+++ b/app/code/Magento/Catalog/Controller/Product/View/ViewInterface.php
@@ -6,6 +6,8 @@
 
 /**
  * Marker interface for controllers on product view page
+ *
+ * @api
  */
 namespace Magento\Catalog\Controller\Product\View;
 
diff --git a/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php b/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php
index bb63281bd4895..eea06a50bf503 100644
--- a/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php
+++ b/app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php
@@ -10,6 +10,7 @@
 /**
  * Interface \Magento\Catalog\Model\Attribute\LockValidatorInterface
  *
+ * @api
  */
 interface LockValidatorInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Config/Source/ProductPriceOptionsInterface.php b/app/code/Magento/Catalog/Model/Config/Source/ProductPriceOptionsInterface.php
index 1d31b8e1f7cee..39e9a1c1205c5 100644
--- a/app/code/Magento/Catalog/Model/Config/Source/ProductPriceOptionsInterface.php
+++ b/app/code/Magento/Catalog/Model/Config/Source/ProductPriceOptionsInterface.php
@@ -9,6 +9,8 @@
 
 /**
  * Interface ProductPriceOptionsInterface
+ *
+ * @api
  */
 interface ProductPriceOptionsInterface extends OptionSourceInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapperInterface.php b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapperInterface.php
index 35af7c4b4a4b8..b5bbe8c6d9e89 100644
--- a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapperInterface.php
+++ b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Group/AttributeMapperInterface.php
@@ -12,6 +12,7 @@
 /**
  * Interface \Magento\Catalog\Model\Entity\Product\Attribute\Group\AttributeMapperInterface
  *
+ * @api
  */
 interface AttributeMapperInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableDataInterface.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableDataInterface.php
index 59ba258dc129a..455d6f09a43b8 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableDataInterface.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableDataInterface.php
@@ -7,6 +7,8 @@
 
 /**
  * Interface TableDataInterface
+ *
+ * @api
  */
 interface TableDataInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/CollectionFilterInterface.php b/app/code/Magento/Catalog/Model/Layer/CollectionFilterInterface.php
index 0727a6d4d3c7b..5ceb7f9972dec 100644
--- a/app/code/Magento/Catalog/Model/Layer/CollectionFilterInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/CollectionFilterInterface.php
@@ -9,6 +9,7 @@
 /**
  * Interface \Magento\Catalog\Model\Layer\CollectionFilterInterface
  *
+ * @api
  */
 interface CollectionFilterInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/FilterableAttributeListInterface.php b/app/code/Magento/Catalog/Model/Layer/FilterableAttributeListInterface.php
index 547e57a909b57..12bc11646b2cb 100644
--- a/app/code/Magento/Catalog/Model/Layer/FilterableAttributeListInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/FilterableAttributeListInterface.php
@@ -9,6 +9,7 @@
 /**
  * Interface \Magento\Catalog\Model\Layer\FilterableAttributeListInterface
  *
+ * @api
  */
 interface FilterableAttributeListInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/ItemCollectionProviderInterface.php b/app/code/Magento/Catalog/Model/Layer/ItemCollectionProviderInterface.php
index 68f21c88a2d03..f9c8f00705614 100644
--- a/app/code/Magento/Catalog/Model/Layer/ItemCollectionProviderInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/ItemCollectionProviderInterface.php
@@ -10,6 +10,7 @@
 /**
  * Interface \Magento\Catalog\Model\Layer\ItemCollectionProviderInterface
  *
+ * @api
  */
 interface ItemCollectionProviderInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/StateKeyInterface.php b/app/code/Magento/Catalog/Model/Layer/StateKeyInterface.php
index 4d43f836af4ce..c751df7494ed0 100644
--- a/app/code/Magento/Catalog/Model/Layer/StateKeyInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/StateKeyInterface.php
@@ -9,6 +9,7 @@
 /**
  * Interface \Magento\Catalog\Model\Layer\StateKeyInterface
  *
+ * @api
  */
 interface StateKeyInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Condition/ConditionInterface.php b/app/code/Magento/Catalog/Model/Product/Condition/ConditionInterface.php
index f1be3a1d4d599..0bb6f7568fa28 100644
--- a/app/code/Magento/Catalog/Model/Product/Condition/ConditionInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Condition/ConditionInterface.php
@@ -12,6 +12,7 @@
 /**
  * Interface \Magento\Catalog\Model\Product\Condition\ConditionInterface
  *
+ * @api
  */
 interface ConditionInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php
index 7baa2e0493207..e765464ea6d3a 100644
--- a/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/Option/OptionInterface.php
@@ -7,6 +7,7 @@
 /**
  * Interface of product configurational item option
  *
+ * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Model\Product\Configuration\Item\Option;
diff --git a/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php b/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
index b609debf3ee10..2392fb24a407f 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
@@ -12,6 +12,7 @@
 /**
  * Interface \Magento\Catalog\Model\Product\Media\ConfigInterface
  *
+ * @api
  */
 interface ConfigInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolverInterface.php b/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolverInterface.php
index 4d17f55114c6a..178ebb3dd6333 100644
--- a/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolverInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolverInterface.php
@@ -8,6 +8,8 @@
 
 /**
  * Interface resolver checks whether product available for sale
+ *
+ * @api
  */
 interface SalableResolverInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProviderInterface.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProviderInterface.php
index 2311ea5e1c506..93f91a70a169b 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/CollectionProviderInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProviderInterface.php
@@ -9,6 +9,7 @@
 /**
  * Interface \Magento\Catalog\Model\ProductLink\CollectionProviderInterface
  *
+ * @api
  */
 interface CollectionProviderInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterInterface.php b/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterInterface.php
index 70e41ce03fb99..74e17152ec256 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Converter/ConverterInterface.php
@@ -9,6 +9,7 @@
 /**
  * Interface \Magento\Catalog\Model\ProductLink\Converter\ConverterInterface
  *
+ * @api
  */
 interface ConverterInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Data/ListCriteriaInterface.php b/app/code/Magento/Catalog/Model/ProductLink/Data/ListCriteriaInterface.php
index 0291be5b9e783..9a174e32d475c 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Data/ListCriteriaInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Data/ListCriteriaInterface.php
@@ -9,6 +9,8 @@
 
 /**
  * Criteria for finding lists.
+ *
+ * @api
  */
 interface ListCriteriaInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Data/ListResultInterface.php b/app/code/Magento/Catalog/Model/ProductLink/Data/ListResultInterface.php
index f5c0454e7a542..984056dfdadc7 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Data/ListResultInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Data/ListResultInterface.php
@@ -11,6 +11,8 @@
 
 /**
  * Result of finding a list of links.
+ *
+ * @api
  */
 interface ListResultInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/MapProviderInterface.php b/app/code/Magento/Catalog/Model/ProductLink/MapProviderInterface.php
index 31951ab10f5b4..571bcd71faa36 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/MapProviderInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/MapProviderInterface.php
@@ -12,6 +12,8 @@
 
 /**
  * Provide link data for products.
+ *
+ * @api
  */
 interface MapProviderInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ProductOptions/ConfigInterface.php b/app/code/Magento/Catalog/Model/ProductOptions/ConfigInterface.php
index b41429736591e..c38fce00524b1 100644
--- a/app/code/Magento/Catalog/Model/ProductOptions/ConfigInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductOptions/ConfigInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface \Magento\Catalog\Model\ProductOptions\ConfigInterface
  *
+ * @api
  */
 interface ConfigInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableStructure.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableStructure.php
index fb3eef2bf38eb..7bd935ab7d3bc 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableStructure.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableStructure.php
@@ -9,6 +9,8 @@
 
 /**
  * Wrapper for structure of price index table.
+ *
+ * @api
  */
 class IndexTableStructure
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceModifierInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceModifierInterface.php
index 6ecb6aba89933..5086ce563f151 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceModifierInterface.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/PriceModifierInterface.php
@@ -9,6 +9,8 @@
 
 /**
  * Interface for modifying price data in price index table.
+ *
+ * @api
  */
 interface PriceModifierInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
index 3411c124bf5ce..55066d4c0014d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
@@ -7,6 +7,8 @@
 
 /**
  * Provide Select object for retrieve product id with minimal price
+ *
+ * @api
  */
 interface LinkedProductSelectBuilderInterface
 {
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php
index e41df30ea1dec..7bd5398b9bda7 100644
--- a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPriceInterface.php
@@ -10,6 +10,8 @@
 
 /**
  * Configured price interface.
+ *
+ * @api
  */
 interface ConfiguredPriceInterface
 {
diff --git a/app/code/Magento/Catalog/Pricing/Price/MinimalPriceCalculatorInterface.php b/app/code/Magento/Catalog/Pricing/Price/MinimalPriceCalculatorInterface.php
index 6c493947919da..acc76523d7603 100644
--- a/app/code/Magento/Catalog/Pricing/Price/MinimalPriceCalculatorInterface.php
+++ b/app/code/Magento/Catalog/Pricing/Price/MinimalPriceCalculatorInterface.php
@@ -11,6 +11,8 @@
 
 /**
  * Interface define methods which control display of "As low as" price
+ *
+ * @api
  */
 interface MinimalPriceCalculatorInterface
 {
diff --git a/app/code/Magento/Catalog/Pricing/Price/SpecialPriceInterface.php b/app/code/Magento/Catalog/Pricing/Price/SpecialPriceInterface.php
index f7a8fa0c9d77c..b9cb223bef0d7 100644
--- a/app/code/Magento/Catalog/Pricing/Price/SpecialPriceInterface.php
+++ b/app/code/Magento/Catalog/Pricing/Price/SpecialPriceInterface.php
@@ -8,6 +8,8 @@
 
 /**
  * Special price interface
+ *
+ * @api
  */
 interface SpecialPriceInterface
 {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessorInterface.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessorInterface.php
index 64faef7ba2761..66f5b586ca56b 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessorInterface.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessorInterface.php
@@ -10,6 +10,8 @@
 
 /**
  * Interface WysiwygConfigDataProcessorInterface
+ *
+ * @api
  */
 interface WysiwygConfigDataProcessorInterface
 {