diff --git a/Magento2/Helpers/Tokenizer/AbstractTokenizer.php b/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
index f49c753f..1a3c4a63 100644
--- a/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
+++ b/Magento2/Helpers/Tokenizer/AbstractTokenizer.php
@@ -11,15 +11,11 @@
 abstract class AbstractTokenizer
 {
     /**
-     * Current index in string
-     *
      * @var int
      */
     protected $_currentIndex;
 
     /**
-     * String for tokenize
-     *
      * @var string
      */
     protected $_string;
diff --git a/Magento2/Helpers/Tokenizer/Variable.php b/Magento2/Helpers/Tokenizer/Variable.php
index 81c8b1d8..43938c03 100644
--- a/Magento2/Helpers/Tokenizer/Variable.php
+++ b/Magento2/Helpers/Tokenizer/Variable.php
@@ -12,8 +12,6 @@
 class Variable extends AbstractTokenizer
 {
     /**
-     * Internal counter used to keep track of how deep in array parsing we are
-     *
      * @var int
      */
     protected $arrayDepth = 0;
diff --git a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
index ed106d4b..85c1f103 100644
--- a/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
+++ b/Magento2/Sniffs/Classes/DiscouragedDependenciesSniff.php
@@ -32,22 +32,16 @@ class DiscouragedDependenciesSniff implements Sniff
     protected $warningCode = 'ConstructorProxyInterceptor';
 
     /**
-     * Aliases of proxies or plugins from use statements
-     *
      * @var string[]
      */
     private $aliases = [];
 
     /**
-     * The current file - used for clearing USE aliases when file changes
-     *
      * @var null|string
      */
     private $currentFile = null;
 
     /**
-     * Terms to search for in variables and namespaces
-     *
      * @var string[]
      */
     public $incorrectClassNames = ['proxy','interceptor'];
diff --git a/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
new file mode 100644
index 00000000..a402fbd8
--- /dev/null
+++ b/Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php
@@ -0,0 +1,158 @@
+<?php
+namespace Magento2\Sniffs\Commenting;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\AbstractVariableSniff;
+use PHP_CodeSniffer\Util\Tokens;
+use Magento2\Helpers\Commenting\PHPDocFormattingValidator;
+
+/**
+ * Class ClassPropertyPHPDocFormattingSniff
+ */
+class ClassPropertyPHPDocFormattingSniff extends AbstractVariableSniff
+{
+
+    /**
+     * @var array
+     */
+    private $ignoreTokens = [
+        T_PUBLIC,
+        T_PRIVATE,
+        T_PROTECTED,
+        T_VAR,
+        T_STATIC,
+        T_WHITESPACE,
+    ];
+
+    /**
+     * @var PHPDocFormattingValidator
+     */
+    private $PHPDocFormattingValidator;
+
+    /**
+     * Constructs an ClassPropertyPHPDocFormattingSniff.
+     */
+    public function __construct()
+    {
+        $scopes = Tokens::$ooScopeTokens;
+        $this->PHPDocFormattingValidator = new PHPDocFormattingValidator();
+        $listen = [
+            T_VARIABLE,
+            T_DOUBLE_QUOTED_STRING,
+            T_HEREDOC,
+        ];
+
+        parent::__construct($scopes, $listen, true);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function processMemberVar(File $phpcsFile, $stackPtr)
+    {
+        $tokens = $phpcsFile->getTokens();
+
+        $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($stackPtr - 1), null, true);
+        if ($commentEnd === false
+            || ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
+                && $tokens[$commentEnd]['code'] !== T_COMMENT)
+        ) {
+            $phpcsFile->addWarning('Missing PHP DocBlock for class property.', $stackPtr, 'Missing');
+            return;
+        }
+        $commentStart = $tokens[$commentEnd]['comment_opener'];
+        $foundVar = null;
+        foreach ($tokens[$commentStart]['comment_tags'] as $tag) {
+            if ($tokens[$tag]['content'] === '@var') {
+                if ($foundVar !== null) {
+                    $error = 'Only one @var tag is allowed for class property declaration.';
+                    $phpcsFile->addWarning($error, $tag, 'DuplicateVar');
+                } else {
+                    $foundVar = $tag;
+                }
+            }
+        }
+
+        if ($foundVar === null) {
+            $error = 'Class properties must have type declaration using @var tag.';
+            $phpcsFile->addWarning($error, $stackPtr, 'MissingVar');
+            return;
+        }
+
+        $string = $phpcsFile->findNext(T_DOC_COMMENT_STRING, $foundVar, $commentEnd);
+        if ($string === false || $tokens[$string]['line'] !== $tokens[$foundVar]['line']) {
+            $error = 'Content missing for @var tag in class property declaration.';
+            $phpcsFile->addWarning($error, $foundVar, 'EmptyVar');
+            return;
+        }
+
+        // Check if class has already have meaningful description after @var tag
+        $isShortDescriptionAfterVar = $phpcsFile->findNext(
+            T_DOC_COMMENT_STRING,
+            $foundVar + 4,
+            $commentEnd,
+            false,
+            null,
+            false
+        );
+        if ($this->PHPDocFormattingValidator->providesMeaning(
+            $isShortDescriptionAfterVar,
+            $commentStart,
+            $tokens
+        ) !== true) {
+            preg_match(
+                '`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i',
+                $tokens[($foundVar + 2)]['content'],
+                $varParts
+            );
+            if ($varParts[1]) {
+                return;
+            }
+            $error = 'Short description duplicates class property name.';
+            $phpcsFile->addWarning($error, $isShortDescriptionAfterVar, 'AlreadyHaveMeaningFulNameVar');
+            return;
+        }
+        // Check if class has already have meaningful description before @var tag
+        $isShortDescriptionPreviousVar = $phpcsFile->findPrevious(
+            T_DOC_COMMENT_STRING,
+            $foundVar,
+            $commentStart,
+            false,
+            null,
+            false
+        );
+        if ($this->PHPDocFormattingValidator->providesMeaning(
+            $isShortDescriptionPreviousVar,
+            $commentStart,
+            $tokens
+        ) !== true) {
+            preg_match(
+                '`^((?:\|?(?:array\([^\)]*\)|[\\\\\[\]]+))*)( .*)?`i',
+                $tokens[($foundVar + 2)]['content'],
+                $varParts
+            );
+            if ($varParts[1]) {
+                return;
+            }
+            $error = 'Short description duplicates class property name.';
+            $phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningFulNameVar');
+            return;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
+     */
+    protected function processVariable(File $phpcsFile, $stackPtr)
+    {
+    }
+
+    /**
+     * @inheritDoc
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
+     */
+    protected function processVariableInString(File $phpcsFile, $stackPtr)
+    {
+    }
+}
diff --git a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
index d5ce80c1..bedb9cfa 100644
--- a/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
+++ b/Magento2/Sniffs/Exceptions/DirectThrowSniff.php
@@ -16,6 +16,7 @@ class DirectThrowSniff implements Sniff
     /**
      * String representation of warning.
      * phpcs:disable Generic.Files.LineLength.TooLong
+     * @var string
      */
     protected $warningMessage = 'Direct throw of generic Exception is discouraged. Use context specific instead.';
     //phpcs:enable
diff --git a/Magento2/Sniffs/Less/AvoidIdSniff.php b/Magento2/Sniffs/Less/AvoidIdSniff.php
index d4e1b213..62346274 100644
--- a/Magento2/Sniffs/Less/AvoidIdSniff.php
+++ b/Magento2/Sniffs/Less/AvoidIdSniff.php
@@ -25,8 +25,6 @@ class AvoidIdSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * Tokens that can appear in a selector
-     *
      * @var array
      */
     private $selectorTokens = [
diff --git a/Magento2/Sniffs/Less/IndentationSniff.php b/Magento2/Sniffs/Less/IndentationSniff.php
index 76a6fbcc..57947a07 100644
--- a/Magento2/Sniffs/Less/IndentationSniff.php
+++ b/Magento2/Sniffs/Less/IndentationSniff.php
@@ -39,8 +39,7 @@ class IndentationSniff implements Sniff
      */
     public $maxIndentLevel = 3;
 
-    /** Skip codes that can be detected by sniffer incorrectly
-     *
+    /**
      * @var array
      */
     private $styleCodesToSkip = [T_ASPERAND, T_COLON, T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS];
diff --git a/Magento2/Sniffs/Less/PropertiesSortingSniff.php b/Magento2/Sniffs/Less/PropertiesSortingSniff.php
index d1c7c387..2c5fe9e5 100644
--- a/Magento2/Sniffs/Less/PropertiesSortingSniff.php
+++ b/Magento2/Sniffs/Less/PropertiesSortingSniff.php
@@ -25,15 +25,11 @@ class PropertiesSortingSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * List of properties that belong to class
-     *
      * @var array
      */
     private $properties = [];
 
     /**
-     * Skip symbols that can be detected by sniffer incorrectly
-     *
      * @var array
      */
     private $styleSymbolsToSkip = [
diff --git a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
index cad13290..8db8d216 100644
--- a/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
+++ b/Magento2/Sniffs/Less/SemicolonSpacingSniff.php
@@ -25,8 +25,6 @@ class SemicolonSpacingSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * Skip symbols that can be detected by sniffer incorrectly
-     *
      * @var array
      */
     private $styleSymbolsToSkip = [
@@ -36,8 +34,7 @@ class SemicolonSpacingSniff implements Sniff
         TokenizerSymbolsInterface::CLOSE_PARENTHESIS,
     ];
 
-    /** Skip codes that can be detected by sniffer incorrectly
-     *
+    /**
      * @var array
      */
     private $styleCodesToSkip = [T_ASPERAND, T_COLON, T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS];
diff --git a/Magento2/Sniffs/Less/TypeSelectorsSniff.php b/Magento2/Sniffs/Less/TypeSelectorsSniff.php
index 00c8b35c..4735c761 100644
--- a/Magento2/Sniffs/Less/TypeSelectorsSniff.php
+++ b/Magento2/Sniffs/Less/TypeSelectorsSniff.php
@@ -23,8 +23,6 @@
 class TypeSelectorsSniff implements Sniff
 {
     /**
-     * Tags that are not allowed as type selector
-     *
      * @var array
      */
     private $tags = [
diff --git a/Magento2/Sniffs/Less/ZeroUnitsSniff.php b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
index 51971c78..c62eaa52 100644
--- a/Magento2/Sniffs/Less/ZeroUnitsSniff.php
+++ b/Magento2/Sniffs/Less/ZeroUnitsSniff.php
@@ -24,8 +24,6 @@ class ZeroUnitsSniff implements Sniff
     const CSS_PROPERTY_UNIT_REM = 'rem';
 
     /**
-     * List of available CSS Property units
-     *
      * @var array
      */
     private $units = [
diff --git a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
index 94bfc2d5..df8fba14 100644
--- a/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
+++ b/Magento2/Sniffs/Methods/DeprecatedModelMethodSniff.php
@@ -40,8 +40,6 @@ class DeprecatedModelMethodSniff implements Sniff
         'delete'
     ];
 
-    protected $severity = 0;
-
     /**
      * @inheritdoc
      */
diff --git a/Magento2/Sniffs/Security/SuperglobalSniff.php b/Magento2/Sniffs/Security/SuperglobalSniff.php
index 466c1cba..c9f58300 100644
--- a/Magento2/Sniffs/Security/SuperglobalSniff.php
+++ b/Magento2/Sniffs/Security/SuperglobalSniff.php
@@ -42,7 +42,7 @@ class SuperglobalSniff implements Sniff
     protected $errorCode = 'SuperglobalUsageError';
 
     /**
-     * @inheritdoc
+     * @var array
      */
     protected $superGlobalErrors = [
         '$GLOBALS',
@@ -55,7 +55,7 @@ class SuperglobalSniff implements Sniff
     ];
 
     /**
-     * @inheritdoc
+     * @var array
      */
     protected $superGlobalWarning = [
         '$_COOKIE', //sometimes need to get list of all cookies array and there are no methods to do that in M2
diff --git a/Magento2/Sniffs/Security/XssTemplateSniff.php b/Magento2/Sniffs/Security/XssTemplateSniff.php
index 43bdfecc..e1fa5d56 100644
--- a/Magento2/Sniffs/Security/XssTemplateSniff.php
+++ b/Magento2/Sniffs/Security/XssTemplateSniff.php
@@ -50,8 +50,6 @@ class XssTemplateSniff implements Sniff
     ];
 
     /**
-     * Allowed method name - {suffix}Html{postfix}()
-     *
      * @var string
      */
     protected $methodNameContains = 'html';
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
new file mode 100644
index 00000000..6dcccf65
--- /dev/null
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc
@@ -0,0 +1,102 @@
+<?php
+
+class Foo
+{
+    /**
+     * @var Foo
+     */
+    private $_classAttribute = '';
+
+    /**
+     * Foo
+     */
+    public $_withoutClassAttribute = '';
+
+    /**
+     * @var Test
+     *
+     * Short Description
+     */
+    protected $_classAttributeWithShortDescription = '';
+
+    /**
+     * @var
+     */
+    private $_emptyClassAttributeContent = '';
+
+
+    /**
+     * @var Foo
+     * @var Bar
+     */
+    private $_multipleClassAttribute = '';
+
+    private $_missingDocBlockClassAttribute = '';
+}
+
+class Bar {
+
+    /**
+     * @var variableHasAlreadyHaveProtectedClassMember
+     *
+     * Short Description
+     */
+    public $variableHasAlreadyHavePublicClassMember;
+
+    /**
+     * @var variableHasAlreadyHavePrivateClassMember
+     *
+     * Short Description
+     */
+    private $variableHasAlreadyHavePrivateClassMember;
+
+    /**
+     * @var variableHasAlreadyHaveProtectedClassMember
+     *
+     * Short Description
+     */
+    protected $variableHasAlreadyHaveProtectedClassMember;
+
+    /**
+     * @var className
+     *
+     * Variable name
+     */
+    private $variableName;
+
+    /**
+     * Some more invalid description
+     *
+     * @var test
+     */
+    protected $test;
+}
+
+class correctlyFormattedClassMemberDocBlock
+{
+    /**
+     * @var correctlyFormattedPublicClassMember
+     */
+    public $correctlyFormattedPublicClassMember;
+
+    /**
+     * @var correctlyFormattedPrivateClassMember
+     */
+    private $correctlyFormattedPrivateClassMember;
+
+    /**
+     * @var correctlyFormattedProtectedClassMember
+     */
+    protected $correctlyFormattedProtectedClassMember;
+
+    /**
+     * @var Array|\Foo_BAR
+     */
+    protected $array;
+
+    /**
+     * @var \FOO\BAR\TEST\Class\\FooBarInterface|
+     *      \FooObject_TEST_C
+     */
+    private $testObject;
+}
diff --git a/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
new file mode 100644
index 00000000..8817ab3b
--- /dev/null
+++ b/Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Commenting;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class ClassPropertyPHPDocFormattingUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [
+            13 => 1,
+            18 => 1,
+            23 => 1,
+            30 => 1,
+            34 => 1,
+            42 => 1,
+            49 => 1,
+            56 => 1,
+            63 => 1,
+            68 => 1
+        ];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 3ea0c969..cf5497f6 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -569,6 +569,10 @@
         <severity>5</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Magento2.Commenting.ClassPropertyPHPDocFormatting">
+        <severity>5</severity>
+        <type>warning</type>
+    </rule>
     <rule ref="Magento2.Commenting.ConstantsPHPDocFormatting">
         <severity>5</severity>
         <type>warning</type>