diff --git a/packages/design/src/config-provider/__tests__/__snapshots__/prefixCls.tsx.snap b/packages/design/src/config-provider/__tests__/__snapshots__/prefixCls.tsx.snap
index b0aeee9ca..eb13988cf 100644
--- a/packages/design/src/config-provider/__tests__/__snapshots__/prefixCls.tsx.snap
+++ b/packages/design/src/config-provider/__tests__/__snapshots__/prefixCls.tsx.snap
@@ -1,121 +1,37 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ConfigProvider prefixCls prefixCls 1`] = `
-<div
-  class="ant-app"
+exports[`ConfigProvider prefixCls iconPrefixCls 1`] = `
+<span
+  aria-label="plus"
+  class="anticon anticon-plus"
+  role="img"
 >
-  <button
-    class="ant-btn ant-btn-default"
-    type="button"
+  <svg
+    aria-hidden="true"
+    data-icon="plus"
+    fill="currentColor"
+    focusable="false"
+    height="1em"
+    viewBox="64 64 896 896"
+    width="1em"
   >
-    <span>
-      button
-    </span>
-  </button>
-  <div
-    class="customPrefixCls-app"
-  >
-    <button
-      class="customPrefixCls-btn customPrefixCls-btn-default"
-      type="button"
-    >
-      <span>
-        button
-      </span>
-    </button>
-    <div
-      class="customPrefixCls-app"
-    >
-      <button
-        class="customPrefixCls-btn customPrefixCls-btn-default"
-        type="button"
-      >
-        <span>
-          button
-        </span>
-      </button>
-    </div>
-  </div>
-</div>
+    <path
+      d="M482 152h60q8 0 8 8v704q0 8-8 8h-60q-8 0-8-8V160q0-8 8-8z"
+    />
+    <path
+      d="M192 474h672q8 0 8 8v60q0 8-8 8H160q-8 0-8-8v-60q0-8 8-8z"
+    />
+  </svg>
+</span>
 `;
 
-exports[`ConfigProvider prefixCls iconPrefixCls 1`] = `
-<div
-  class="ant-app"
+exports[`ConfigProvider prefixCls prefixCls 1`] = `
+<button
+  class="ant-btn ant-btn-default"
+  type="button"
 >
-  <span
-    aria-label="plus"
-    class="anticon anticon-plus"
-    role="img"
-  >
-    <svg
-      aria-hidden="true"
-      data-icon="plus"
-      fill="currentColor"
-      focusable="false"
-      height="1em"
-      viewBox="64 64 896 896"
-      width="1em"
-    >
-      <path
-        d="M482 152h60q8 0 8 8v704q0 8-8 8h-60q-8 0-8-8V160q0-8 8-8z"
-      />
-      <path
-        d="M192 474h672q8 0 8 8v60q0 8-8 8H160q-8 0-8-8v-60q0-8 8-8z"
-      />
-    </svg>
+  <span>
+    button
   </span>
-  <div
-    class="ant-app"
-  >
-    <span
-      aria-label="plus"
-      class="customIconPrefixCls customIconPrefixCls-plus"
-      role="img"
-    >
-      <svg
-        aria-hidden="true"
-        data-icon="plus"
-        fill="currentColor"
-        focusable="false"
-        height="1em"
-        viewBox="64 64 896 896"
-        width="1em"
-      >
-        <path
-          d="M482 152h60q8 0 8 8v704q0 8-8 8h-60q-8 0-8-8V160q0-8 8-8z"
-        />
-        <path
-          d="M192 474h672q8 0 8 8v60q0 8-8 8H160q-8 0-8-8v-60q0-8 8-8z"
-        />
-      </svg>
-    </span>
-    <div
-      class="ant-app"
-    >
-      <span
-        aria-label="plus"
-        class="customIconPrefixCls customIconPrefixCls-plus"
-        role="img"
-      >
-        <svg
-          aria-hidden="true"
-          data-icon="plus"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="64 64 896 896"
-          width="1em"
-        >
-          <path
-            d="M482 152h60q8 0 8 8v704q0 8-8 8h-60q-8 0-8-8V160q0-8 8-8z"
-          />
-          <path
-            d="M192 474h672q8 0 8 8v60q0 8-8 8H160q-8 0-8-8v-60q0-8 8-8z"
-          />
-        </svg>
-      </span>
-    </div>
-  </div>
-</div>
+</button>
 `;
diff --git a/packages/design/src/config-provider/__tests__/__snapshots__/spin.test.tsx.snap b/packages/design/src/config-provider/__tests__/__snapshots__/spin.test.tsx.snap
index b85980572..8f03ef83d 100644
--- a/packages/design/src/config-provider/__tests__/__snapshots__/spin.test.tsx.snap
+++ b/packages/design/src/config-provider/__tests__/__snapshots__/spin.test.tsx.snap
@@ -2,49 +2,24 @@
 
 exports[`ConfigProvider spin spin.indicator should work 1`] = `
 <div
-  class="ant-app"
+  aria-busy="true"
+  aria-live="polite"
+  class="ant-spin ant-spin-spinning"
 >
   <div
-    aria-busy="true"
-    aria-live="polite"
-    class="ant-spin ant-spin-spinning"
-  >
-    <div
-      class="custom-indicator ant-spin-dot"
-    />
-  </div>
+    class="custom-indicator ant-spin-dot"
+  />
 </div>
 `;
 
 exports[`ConfigProvider spin spin.indicator should work in nested ConfigProvider 1`] = `
 <div
-  class="ant-app"
+  aria-busy="true"
+  aria-live="polite"
+  class="ant-spin ant-spin-spinning"
 >
   <div
-    class="ant-app"
-  >
-    <div
-      aria-busy="true"
-      aria-live="polite"
-      class="ant-spin ant-spin-spinning"
-    >
-      <div
-        class="custom-indicator-1 ant-spin-dot"
-      />
-    </div>
-  </div>
-  <div
-    class="ant-app"
-  >
-    <div
-      aria-busy="true"
-      aria-live="polite"
-      class="ant-spin ant-spin-spinning"
-    >
-      <div
-        class="custom-indicator-2 ant-spin-dot"
-      />
-    </div>
-  </div>
+    class="custom-indicator-1 ant-spin-dot"
+  />
 </div>
 `;
diff --git a/packages/design/src/config-provider/__tests__/__snapshots__/styleProviderProps.test.tsx.snap b/packages/design/src/config-provider/__tests__/__snapshots__/styleProviderProps.test.tsx.snap
index bee5b4f54..c32130d61 100644
--- a/packages/design/src/config-provider/__tests__/__snapshots__/styleProviderProps.test.tsx.snap
+++ b/packages/design/src/config-provider/__tests__/__snapshots__/styleProviderProps.test.tsx.snap
@@ -1,19 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ConfigProvider styleProviderProps ConfigProvider styleProviderProps.hashPriority 1`] = `
-<div
-  class="ant-app"
->
-  <div />
-  <div
-    class="ant-app"
-  >
-    <div />
-  </div>
-  <div
-    class="ant-app"
-  >
-    <div />
-  </div>
-</div>
-`;
+exports[`ConfigProvider styleProviderProps ConfigProvider styleProviderProps.hashPriority 1`] = `<div />`;
diff --git a/packages/design/src/config-provider/index.tsx b/packages/design/src/config-provider/index.tsx
index c724d6124..f19ed712d 100644
--- a/packages/design/src/config-provider/index.tsx
+++ b/packages/design/src/config-provider/index.tsx
@@ -43,6 +43,7 @@ export interface ConfigConsumerProps extends AntConfigConsumerProps {
   hideOnSinglePage?: boolean;
   spin?: SpinConfig;
   table?: TableConfig;
+  builtInApp?: boolean;
   locale?: Locale;
 }
 
@@ -129,7 +130,7 @@ const ConfigProvider = ({
         <StyleProvider {...mergedStyleProviderProps}>
           {/* Nested App component for static function of message, notification and Modal to consume ConfigProvider config */}
           {/* ref: https://ant.design/components/app */}
-          <App>
+          <App component={false}>
             {children}
             <StaticFunction />
           </App>
diff --git a/packages/design/src/form/__tests__/__snapshots__/index.test.tsx.snap b/packages/design/src/form/__tests__/__snapshots__/index.test.tsx.snap
index 0a9f79483..5c0231734 100644
--- a/packages/design/src/form/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/design/src/form/__tests__/__snapshots__/index.test.tsx.snap
@@ -1,92 +1,88 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Drawer Form hideRequiredMark should be priority over ConfigProvider form.requiredMark 1`] = `
-<div
-  class="ant-app"
+exports[`Form Form hideRequiredMark should be priority over ConfigProvider form.requiredMark 1`] = `
+<form
+  class="ant-form ant-form-horizontal ant-form-hide-required-mark"
 >
-  <form
-    class="ant-form ant-form-horizontal ant-form-hide-required-mark"
+  <div
+    class="ant-form-item"
   >
     <div
-      class="ant-form-item"
+      class="ant-row ant-form-item-row"
     >
       <div
-        class="ant-row ant-form-item-row"
+        class="ant-col ant-form-item-label"
       >
-        <div
-          class="ant-col ant-form-item-label"
+        <label
+          class="ant-form-item-required"
+          for="name"
+          title="Name"
         >
-          <label
-            class="ant-form-item-required"
-            for="name"
-            title="Name"
-          >
-            Name
-          </label>
-        </div>
+          Name
+        </label>
+      </div>
+      <div
+        class="ant-col ant-form-item-control"
+      >
         <div
-          class="ant-col ant-form-item-control"
+          class="ant-form-item-control-input"
         >
           <div
-            class="ant-form-item-control-input"
+            class="ant-form-item-control-input-content"
           >
-            <div
-              class="ant-form-item-control-input-content"
-            >
-              <input
-                aria-required="true"
-                class="ant-input"
-                id="name"
-                type="text"
-                value=""
-              />
-            </div>
+            <input
+              aria-required="true"
+              class="ant-input"
+              id="name"
+              type="text"
+              value=""
+            />
           </div>
         </div>
       </div>
     </div>
+  </div>
+  <div
+    class="ant-form-item"
+  >
     <div
-      class="ant-form-item"
+      class="ant-row ant-form-item-row"
     >
       <div
-        class="ant-row ant-form-item-row"
+        class="ant-col ant-form-item-label"
       >
-        <div
-          class="ant-col ant-form-item-label"
+        <label
+          class=""
+          for="address"
+          title="Address"
         >
-          <label
-            class=""
-            for="address"
-            title="Address"
-          >
-            Address
-          </label>
-        </div>
+          Address
+        </label>
+      </div>
+      <div
+        class="ant-col ant-form-item-control"
+      >
         <div
-          class="ant-col ant-form-item-control"
+          class="ant-form-item-control-input"
         >
           <div
-            class="ant-form-item-control-input"
+            class="ant-form-item-control-input-content"
           >
-            <div
-              class="ant-form-item-control-input-content"
-            >
-              <input
-                class="ant-input"
-                id="address"
-                type="text"
-                value=""
-              />
-            </div>
+            <input
+              class="ant-input"
+              id="address"
+              type="text"
+              value=""
+            />
           </div>
         </div>
       </div>
     </div>
-  </form>
-</div>
+  </div>
+</form>
 `;
 
-exports[`Drawer requiredMark could be changed 1`] = `
+exports[`Form requiredMark could be changed 1`] = `
 <form
   class="ant-form ant-form-horizontal"
 >
@@ -168,93 +164,89 @@ exports[`Drawer requiredMark could be changed 1`] = `
 </form>
 `;
 
-exports[`Drawer requiredMark could be changed by ConfigProvider 1`] = `
-<div
-  class="ant-app"
+exports[`Form requiredMark could be changed by ConfigProvider 1`] = `
+<form
+  class="ant-form ant-form-horizontal"
 >
-  <form
-    class="ant-form ant-form-horizontal"
+  <div
+    class="ant-form-item"
   >
     <div
-      class="ant-form-item"
+      class="ant-row ant-form-item-row"
     >
       <div
-        class="ant-row ant-form-item-row"
+        class="ant-col ant-form-item-label"
       >
-        <div
-          class="ant-col ant-form-item-label"
+        <label
+          class="ant-form-item-required"
+          for="name"
+          title="Name"
         >
-          <label
-            class="ant-form-item-required"
-            for="name"
-            title="Name"
-          >
-            Name
-          </label>
-        </div>
+          Name
+        </label>
+      </div>
+      <div
+        class="ant-col ant-form-item-control"
+      >
         <div
-          class="ant-col ant-form-item-control"
+          class="ant-form-item-control-input"
         >
           <div
-            class="ant-form-item-control-input"
+            class="ant-form-item-control-input-content"
           >
-            <div
-              class="ant-form-item-control-input-content"
-            >
-              <input
-                aria-required="true"
-                class="ant-input"
-                id="name"
-                type="text"
-                value=""
-              />
-            </div>
+            <input
+              aria-required="true"
+              class="ant-input"
+              id="name"
+              type="text"
+              value=""
+            />
           </div>
         </div>
       </div>
     </div>
+  </div>
+  <div
+    class="ant-form-item"
+  >
     <div
-      class="ant-form-item"
+      class="ant-row ant-form-item-row"
     >
       <div
-        class="ant-row ant-form-item-row"
+        class="ant-col ant-form-item-label"
       >
-        <div
-          class="ant-col ant-form-item-label"
+        <label
+          class=""
+          for="address"
+          title="Address"
         >
-          <label
-            class=""
-            for="address"
-            title="Address"
-          >
-            Address
-          </label>
-        </div>
+          Address
+        </label>
+      </div>
+      <div
+        class="ant-col ant-form-item-control"
+      >
         <div
-          class="ant-col ant-form-item-control"
+          class="ant-form-item-control-input"
         >
           <div
-            class="ant-form-item-control-input"
+            class="ant-form-item-control-input-content"
           >
-            <div
-              class="ant-form-item-control-input-content"
-            >
-              <input
-                class="ant-input"
-                id="address"
-                type="text"
-                value=""
-              />
-            </div>
+            <input
+              class="ant-input"
+              id="address"
+              type="text"
+              value=""
+            />
           </div>
         </div>
       </div>
     </div>
-  </form>
-</div>
+  </div>
+</form>
 `;
 
-exports[`Drawer requiredMark should be optional by default 1`] = `
+exports[`Form requiredMark should be optional by default 1`] = `
 <form
   class="ant-form ant-form-horizontal"
 >
diff --git a/packages/design/src/form/__tests__/index.test.tsx b/packages/design/src/form/__tests__/index.test.tsx
index 45bb843b8..4138ac0b4 100644
--- a/packages/design/src/form/__tests__/index.test.tsx
+++ b/packages/design/src/form/__tests__/index.test.tsx
@@ -23,7 +23,7 @@ const FormTest: React.FC<FormProps> = props => (
   </Form>
 );
 
-describe('Drawer', () => {
+describe('Form', () => {
   it('requiredMark should be optional by default', () => {
     const { container, asFragment } = render(<FormTest />);
     expect(