Merge branch '1.7' into 2.0

Author: Zhen Li

pom.xml

@@ -115,7 +115,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.9.7</version>
+        <version>2.9.8</version>
         <scope>test</scope>
       </dependency>
       <dependency>