diff --git a/README.md b/README.md
index 4f927194be..1a487d3207 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
   <img width="180px" height="41px" src="https://suitecrm.com/wp-content/uploads/2017/12/logo.png" align="right" />
 </a>
 
-# SuiteCRM 8.2.2
+# SuiteCRM 8.2.3
 
 [![LICENSE](https://img.shields.io/github/license/suitecrm/suitecrm.svg)](https://github.com/salesagility/suitecrm/blob/hotfix/LICENSE.txt)
 [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/salesagility/SuiteCRM-Core/issues)
diff --git a/VERSION b/VERSION
index 308c0cb541..1365b9236b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.2.2
+8.2.3
diff --git a/core/app/common/package.json b/core/app/common/package.json
index 177748dfeb..09304b9c4d 100644
--- a/core/app/common/package.json
+++ b/core/app/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.2.2",
+  "version": "8.2.3",
   "peerDependencies": {
     "@angular/common": "^12.1.0",
     "@angular/core": "^12.1.0",
diff --git a/core/app/core/package.json b/core/app/core/package.json
index 8603aa38e4..dc1725679b 100644
--- a/core/app/core/package.json
+++ b/core/app/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "8.2.2",
+  "version": "8.2.3",
   "peerDependencies": {
     "@angular/common": "^12.1.0",
     "@angular/core": "^12.1.0",
diff --git a/package.json b/package.json
index 57f02ae8e7..5239858715 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "suitecrm",
-  "version": "8.2.2",
+  "version": "8.2.3",
   "scripts": {
     "ng": "ng",
     "start": "npm run start:shell",
diff --git a/public/legacy/deprecated.php b/public/legacy/deprecated.php
index de6a8fbefa..e5dd072b64 100644
--- a/public/legacy/deprecated.php
+++ b/public/legacy/deprecated.php
@@ -18,7 +18,9 @@
 ];
 
 foreach ($saml2_class_names as $name) {
-    class_alias("OneLogin\\Saml2\\" . $name, 'OneLogin_Saml2_' . $name);
+    if (!class_exists('OneLogin_Saml2_' . $name)) {
+        class_alias("OneLogin\\Saml2\\" . $name, 'OneLogin_Saml2_' . $name);
+    }
 }
 
 if (!class_exists(OneLogin_Saml2_Auth::class)) {
@@ -52,7 +54,10 @@ class OneLogin_Saml2_Utils {}
 /**
  * Backwards compatibility for Zend
  */
-class_alias('SuiteCRM\\Zend_Oauth_Provider', 'Zend\\Oauth\\Provider');
+
+if (!class_exists('Zend\\Oauth\\Provider')){
+    class_alias('SuiteCRM\\Zend_Oauth_Provider', 'Zend\\Oauth\\Provider');
+}
 
 if (!class_exists(Provider::class)) {
     /** @deprecated this is an alias for Zend_Oauth_Provider */