diff --git a/components/badge/ScrollNumber.jsx b/components/badge/ScrollNumber.jsx
index 9b76a1cde..d4dd04107 100644
--- a/components/badge/ScrollNumber.jsx
+++ b/components/badge/ScrollNumber.jsx
@@ -51,16 +51,30 @@ export default {
   updated() {
     const { animateStarted, count } = this;
     if (animateStarted) {
-      this.setState(
-        {
-          animateStarted: false,
-          sCount: count,
-        },
-        this.onAnimated,
-      );
+      this.clearTimeout();
+      // Let browser has time to reset the scroller before actually
+      // performing the transition.
+      this.timeout = setTimeout(() => {
+        this.setState(
+          {
+            animateStarted: false,
+            sCount: count,
+          },
+          this.onAnimated,
+        );
+      });
     }
   },
+  beforeDestroy() {
+    this.clearTimeout();
+  },
   methods: {
+    clearTimeout() {
+      if (this.timeout) {
+        clearTimeout(this.timeout);
+        this.timeout = undefined;
+      }
+    },
     getPositionByNum(num, i) {
       const { sCount } = this;
       const currentCount = Math.abs(Number(sCount));
diff --git a/components/date-picker/style/Picker.less b/components/date-picker/style/Picker.less
index e0a5e119c..29dce9bbc 100644
--- a/components/date-picker/style/Picker.less
+++ b/components/date-picker/style/Picker.less
@@ -102,6 +102,10 @@
     line-height: 1;
   }
 
+  .@{ant-prefix}-input-disabled + &-icon {
+    cursor: not-allowed;
+  }
+
   &-small &-clear,
   &-small &-icon {
     right: @control-padding-horizontal-sm;
diff --git a/components/grid/style/index.less b/components/grid/style/index.less
index cf05ef106..32010e185 100644
--- a/components/grid/style/index.less
+++ b/components/grid/style/index.less
@@ -10,6 +10,10 @@
   box-sizing: border-box;
 }
 
+.@{ant-prefix}-row + .@{ant-prefix}-row::before {
+  clear: both;
+}
+
 .@{ant-prefix}-row-flex {
   display: flex;
   flex-flow: row wrap;
diff --git a/components/result/index.jsx b/components/result/index.jsx
index dcf64e5c5..e925bffc3 100644
--- a/components/result/index.jsx
+++ b/components/result/index.jsx
@@ -33,7 +33,7 @@ export const ResultProps = {
 };
 
 const renderIcon = (h, prefixCls, { status, icon }) => {
-  if (ExceptionStatus.includes(status)) {
+  if (ExceptionStatus.includes(`${status}`)) {
     const SVGComponent = ExceptionMap[status];
     return (
       <div class={`${prefixCls}-icon ${prefixCls}-image`}>
diff --git a/components/table/style/index.less b/components/table/style/index.less
index 300a3e4f6..1aea8a07e 100644
--- a/components/table/style/index.less
+++ b/components/table/style/index.less
@@ -445,16 +445,14 @@
     box-shadow: @box-shadow-base;
 
     .@{ant-prefix}-dropdown-menu {
+      // https://github.com/ant-design/ant-design/issues/4916
+      // https://github.com/ant-design/ant-design/issues/19542
+      max-height: calc(100vh - 130px);
+      overflow-x: hidden;
       border: 0;
       border-radius: @border-radius-base @border-radius-base 0 0;
       box-shadow: none;
 
-      // https://github.com/ant-design/ant-design/issues/4916
-      &-without-submenu {
-        max-height: 400px;
-        overflow-x: hidden;
-      }
-
       &-item > label + span {
         padding-right: 0;
       }
diff --git a/scripts/syncStyleFromAntd.js b/scripts/syncStyleFromAntd.js
index 640aba6a3..d5def3630 100644
--- a/scripts/syncStyleFromAntd.js
+++ b/scripts/syncStyleFromAntd.js
@@ -6,7 +6,7 @@ const path = require('path');
 
 const owner = 'ant-design';
 const repo = 'ant-design';
-const tag = '3.26.12';
+const tag = '3.26.13';
 const clientId = '5f6ccfdc4cdc69f8ba12';
 const clientSecret = process.env.CLIENT_SECRET;