diff --git a/app/code/Magento/Catalog/Model/Layer/ContextInterface.php b/app/code/Magento/Catalog/Model/Layer/ContextInterface.php
index 00aec9db66f7a..6af8df9238707 100644
--- a/app/code/Magento/Catalog/Model/Layer/ContextInterface.php
+++ b/app/code/Magento/Catalog/Model/Layer/ContextInterface.php
@@ -16,6 +16,8 @@
  *
  * As Magento moves from inheritance-based APIs all such classes will be deprecated together with their
  * corresponding abstract classes.
+ *
+ * @deprecated
  */
 interface ContextInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/ImagesConfigFactoryInterface.php b/app/code/Magento/Catalog/Model/Product/Gallery/ImagesConfigFactoryInterface.php
index 7a656951f8b56..2363fb8cc45de 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/ImagesConfigFactoryInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/ImagesConfigFactoryInterface.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Catalog\Model\Product\Gallery;
 
+/**
+ * Interface ImagesConfigFactoryInterface
+ * @api
+ */
 interface ImagesConfigFactoryInterface
 {
     /**
diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index 0addbf069cba3..eec5c1c967ef0 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -260,7 +260,7 @@ public function getQuote()
                     }
 
                     /**
-                     * If current currency code of quote is not equal current currency code of store,
+                     * If current currency code of quote is not equal to current currency code of store,
                      * need recalculate totals of quote. It is possible if customer use currency switcher or
                      * store switcher.
                      */
@@ -268,8 +268,8 @@ public function getQuote()
                         $quote->setStore($this->_storeManager->getStore());
                         $this->quoteRepository->save($quote->collectTotals());
                         /*
-                         * We mast to create new quote object, because collectTotals()
-                         * can to create links with other objects.
+                         * We must to create new quote object, because collectTotals()
+                         * can create links with other objects.
                          */
                         $quote = $this->quoteRepository->get($this->getQuoteId());
                     }
diff --git a/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php b/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
index d48ff5918c3f3..73de6fb1e50ae 100644
--- a/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
+++ b/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
@@ -15,6 +15,8 @@
 
 /**
  * Class CurrentCustomer
+ * @deprecated use \Magento\Customer\Model\Session
+ *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class CurrentCustomer
diff --git a/lib/internal/Magento/Framework/App/Helper/Context.php b/lib/internal/Magento/Framework/App/Helper/Context.php
index 5b90df8c55205..0e02762f8e3a6 100644
--- a/lib/internal/Magento/Framework/App/Helper/Context.php
+++ b/lib/internal/Magento/Framework/App/Helper/Context.php
@@ -17,6 +17,8 @@
  *
  * As Magento moves from inheritance-based APIs all such classes will be deprecated together with
  * the classes they were introduced for.
+ *
+ * @deprecated
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/EntityManager.php b/lib/internal/Magento/Framework/EntityManager/EntityManager.php
index 1adb03cdfb1a4..bace7892e24d7 100644
--- a/lib/internal/Magento/Framework/EntityManager/EntityManager.php
+++ b/lib/internal/Magento/Framework/EntityManager/EntityManager.php
@@ -22,6 +22,8 @@
  *
  * For filtering operations, it's recommended to use successor of
  * Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection class.
+ * 
+ * @deprecated
  */
 class EntityManager
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/EntityMetadataInterface.php b/lib/internal/Magento/Framework/EntityManager/EntityMetadataInterface.php
index ce19f76663721..29d0abe53bc8f 100644
--- a/lib/internal/Magento/Framework/EntityManager/EntityMetadataInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/EntityMetadataInterface.php
@@ -8,6 +8,7 @@
 
 /**
  * Interface EntityMetadataInterface
+ * @deprecated
  */
 interface EntityMetadataInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/HydratorInterface.php b/lib/internal/Magento/Framework/EntityManager/HydratorInterface.php
index a55782914a0db..7a6b8d5b5e81b 100644
--- a/lib/internal/Magento/Framework/EntityManager/HydratorInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/HydratorInterface.php
@@ -8,6 +8,7 @@
 
 /**
  * Interface HydratorInterface
+ * @deprecated
  */
 interface HydratorInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/MapperInterface.php b/lib/internal/Magento/Framework/EntityManager/MapperInterface.php
index 62a0534cf7f68..15acc840d09b1 100644
--- a/lib/internal/Magento/Framework/EntityManager/MapperInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/MapperInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * MapperInterface
+ * @deprecated
  */
 interface MapperInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/AttributeInterface.php b/lib/internal/Magento/Framework/EntityManager/Operation/AttributeInterface.php
index 36ac093fba783..c4c86e75e10e4 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/AttributeInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/AttributeInterface.php
@@ -8,6 +8,7 @@
 
 /**
  * Interface AttributeInterface
+ * @deprecated
  */
 interface AttributeInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/CheckIfExistsInterface.php b/lib/internal/Magento/Framework/EntityManager/Operation/CheckIfExistsInterface.php
index 03bb22d06ee40..000d38ee05100 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/CheckIfExistsInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/CheckIfExistsInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Interface for checking if entity exists
+ * @deprecated
  */
 interface CheckIfExistsInterface extends OperationInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/CreateInterface.php b/lib/internal/Magento/Framework/EntityManager/Operation/CreateInterface.php
index dea1c0b672d6e..65c069b5d6960 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/CreateInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/CreateInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Interface for creating entity
+ * @deprecated
  */
 interface CreateInterface extends OperationInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/DeleteInterface.php b/lib/internal/Magento/Framework/EntityManager/Operation/DeleteInterface.php
index 2817825d03ff2..d74a34857802f 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/DeleteInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/DeleteInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Interface for deleting entity
+ * @deprecated
  */
 interface DeleteInterface extends OperationInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionInterface.php b/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionInterface.php
index 2138b102b31fe..d925fe97bcea0 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * Interface ExtensionInterface
+ * @deprecated
  */
 interface ExtensionInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/ReadInterface.php b/lib/internal/Magento/Framework/EntityManager/Operation/ReadInterface.php
index 6f00c61339cb6..03723cf06fedc 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/ReadInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/ReadInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Interface for reading entity data
+ * @deprecated
  */
 interface ReadInterface extends OperationInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/UpdateInterface.php b/lib/internal/Magento/Framework/EntityManager/Operation/UpdateInterface.php
index 13838388bc3d4..86751327f962d 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/UpdateInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/UpdateInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Interface for updating entity
+ * @deprecated
  */
 interface UpdateInterface extends OperationInterface
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/OperationInterface.php b/lib/internal/Magento/Framework/EntityManager/OperationInterface.php
index 8fe29a6fad9a6..413fa821fc8e5 100644
--- a/lib/internal/Magento/Framework/EntityManager/OperationInterface.php
+++ b/lib/internal/Magento/Framework/EntityManager/OperationInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * Marker interface for entity manager operations.
+ * @deprecated this component was never finished and not recommended for usage
  */
 interface OperationInterface
 {
diff --git a/lib/internal/Magento/Framework/HTTP/ZendClient.php b/lib/internal/Magento/Framework/HTTP/ZendClient.php
index f88e6fabcb6f1..cb5b7e684d2ef 100644
--- a/lib/internal/Magento/Framework/HTTP/ZendClient.php
+++ b/lib/internal/Magento/Framework/HTTP/ZendClient.php
@@ -8,6 +8,7 @@
  * Magento HTTP Client
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @deprecated Use \Magento\Framework\HTTP\ClientInterface
  */
 namespace Magento\Framework\HTTP;
 
diff --git a/lib/internal/Magento/Framework/Url/Helper/Data.php b/lib/internal/Magento/Framework/Url/Helper/Data.php
index bb69ce9946c2a..801cd17c608fe 100644
--- a/lib/internal/Magento/Framework/Url/Helper/Data.php
+++ b/lib/internal/Magento/Framework/Url/Helper/Data.php
@@ -8,6 +8,8 @@
  * Core URL helper
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ *
+ * @deprecated Use @api \Magento\Framework\Url\EncoderInterface::encode and \Magento\Framework\UrlInterface::getCurrentUrl
  */
 namespace Magento\Framework\Url\Helper;