diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dfc6a7985..1382423fcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,29 @@ should change the heading of the (upcoming) version to include a major version b
 -->
 # v5.0.0 (coming soon)
 
+# 4.2.0
+
+## @rjsf/core
+- Feature for ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
+
+## Dev / docs / playground
+- Enable ui options in playground, to demonstrate submit button options (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
+
+## @rjsf/material-ui
+- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2833)
+  
+## @rjsf/bootstrap-4
+- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
+
+## @rjsf/semantic-ui
+- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
+
+## @rjsf/antd
+- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
+
+## @rjsf/fluent-ui
+- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
+
 # v4.1.1 (upcoming)
 
 ## @rjsf/material-ui
@@ -98,21 +121,6 @@ should change the heading of the (upcoming) version to include a major version b
 - Upgrade jsonpointer to 5.0.0 to address security vulnerability (https://github.com/rjsf-team/react-jsonschema-form/pull/2599)
 - Feature for ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
 
-## Dev / docs / playground
-- Enable ui options in playground, to demonstrate submit button options (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
-
-## @rjsf/bootstrap-4
-- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
-
-## @rjsf/semantic-ui
-- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
-
-## @rjsf/antd
-- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
-
-## @rjsf/fluent-ui
-- SubmitButton widget to use new ui:submitButtonOptions on the submit button for forms (https://github.com/rjsf-team/react-jsonschema-form/pull/2640)
-
 # v3.2.0
 
 ## @rjsf/core
diff --git a/packages/bootstrap-4/package.json b/packages/bootstrap-4/package.json
index 03613e4426..a3e04f657d 100644
--- a/packages/bootstrap-4/package.json
+++ b/packages/bootstrap-4/package.json
@@ -15,7 +15,8 @@
   "scripts": {
     "start": "tsdx watch",
     "build": "rimraf dist && tsdx build",
-    "test": "tsdx test"
+    "test": "tsdx test",
+    "test:update":"tsdx test --u"
   },
   "peerDependencies": {
     "@rjsf/core": "^4.0.0",
diff --git a/packages/chakra-ui/package.json b/packages/chakra-ui/package.json
index 1d6366e45f..17bb90daed 100644
--- a/packages/chakra-ui/package.json
+++ b/packages/chakra-ui/package.json
@@ -12,6 +12,7 @@
     "start": "tsdx watch",
     "build": "rimraf dist && tsdx build",
     "test": "tsdx test",
+    "test:update": "tsdx test --u",
     "test:watch": "tsdx test --watch"
   },
   "engineStrict": false,
diff --git a/packages/material-ui/src/SubmitButton/SubmitButton.tsx b/packages/material-ui/src/SubmitButton/SubmitButton.tsx
index a08b4e3472..03e23d16f3 100644
--- a/packages/material-ui/src/SubmitButton/SubmitButton.tsx
+++ b/packages/material-ui/src/SubmitButton/SubmitButton.tsx
@@ -1,11 +1,10 @@
 import React from 'react';
-import Box from "@material-ui/core/Box";
 import { WidgetProps, utils } from '@rjsf/core';
-
-import Button from '@material-ui/core/Button';
+import { useMuiComponent } from '../MuiComponentContext';
 
 const { getSubmitButtonOptions } = utils;
 const SubmitButton: React.FC<WidgetProps> = props => {
+  const { Box, Button } = useMuiComponent();
   const { submitText, norender, props: submitButtonProps }= getSubmitButtonOptions(props.uiSchema);
   if(norender) return null;
   return (