diff --git a/.circleci/config.yml b/.circleci/config.yml
index b5903350f..ccdd5aaee 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,3 +72,11 @@ workflows:
             - run:
                 name: Checkstyle
                 command: ./gradlew checkstyle
+            - run:
+                name: Diff-Checkstyle
+                command: |
+                  git fetch origin develop
+                  branchBaseCommit=`git merge-base origin/develop HEAD`
+                  echo "Comparing to $branchBaseCommit"
+                  curl -s -L https://github.com/yangziwen/diff-checkstyle/releases/download/0.0.4/diff-checkstyle.jar > diff-checkstyle.jar
+                  java -Dconfig_loc=config/checkstyle -jar diff-checkstyle.jar -c config/checkstyle/checkstyle-new-code.xml --git-dir . --base-rev $branchBaseCommit
diff --git a/config/checkstyle/checkstyle-best-practice.xml b/config/checkstyle/checkstyle-new-code.xml
similarity index 93%
rename from config/checkstyle/checkstyle-best-practice.xml
rename to config/checkstyle/checkstyle-new-code.xml
index 154d2a896..0076bac23 100644
--- a/config/checkstyle/checkstyle-best-practice.xml
+++ b/config/checkstyle/checkstyle-new-code.xml
@@ -2,14 +2,9 @@
 <!DOCTYPE module PUBLIC
           "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
           "https://checkstyle.org/dtds/configuration_1_3.dtd">
-<!--
-    Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html.
-    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
- -->
 <module name = "Checker">
     <property name="charset" value="UTF-8"/>
-    <property name="severity" value="warning"/>
+    <property name="severity" value="error"/>
     <property name="fileExtensions" value="java, properties, xml"/>
 
     <module name="SuppressionFilter">
@@ -219,15 +214,6 @@
             <property name="target"
              value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
-        <module name="JavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="2"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
-        </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
             <message key="name.invalidPattern"