diff --git a/buildscripts/rebrand-guard/compat-baseline.json b/buildscripts/rebrand-guard/compat-baseline.json
index ccacdc502..1ab6313da 100644
--- a/buildscripts/rebrand-guard/compat-baseline.json
+++ b/buildscripts/rebrand-guard/compat-baseline.json
@@ -41,6 +41,7 @@
     "github.com/minio/minio/internal/auth",
     "github.com/minio/minio/internal/bpool",
     "github.com/minio/minio/internal/bucket/bandwidth",
+    "github.com/minio/minio/internal/bucket/cors",
     "github.com/minio/minio/internal/bucket/encryption",
     "github.com/minio/minio/internal/bucket/lifecycle",
     "github.com/minio/minio/internal/bucket/object/lock",
@@ -857,6 +858,7 @@
     "/minio/health/cluster/read",
     "/minio/health/live",
     "/minio/health/ready",
+    "/mybucket/obj",
     "/myobject*",
     "/netperf",
     "/newfolder",
@@ -1708,6 +1710,8 @@
     "cmd:cmd:field:BucketMetadata.BucketTargetsConfigMetaJSON",
     "cmd:cmd:field:BucketMetadata.BucketTargetsConfigMetaUpdatedAt",
     "cmd:cmd:field:BucketMetadata.BucketTargetsConfigUpdatedAt",
+    "cmd:cmd:field:BucketMetadata.CorsConfigUpdatedAt",
+    "cmd:cmd:field:BucketMetadata.CorsConfigXML",
     "cmd:cmd:field:BucketMetadata.Created",
     "cmd:cmd:field:BucketMetadata.EncryptionConfigUpdatedAt",
     "cmd:cmd:field:BucketMetadata.EncryptionConfigXML",
@@ -3126,6 +3130,8 @@
     "cmd:cmd:method:BucketMetadataSys.GetBucketTargetsConfig",
     "cmd:cmd:method:BucketMetadataSys.GetConfig",
     "cmd:cmd:method:BucketMetadataSys.GetConfigFromDisk",
+    "cmd:cmd:method:BucketMetadataSys.GetCorsConfig",
+    "cmd:cmd:method:BucketMetadataSys.GetCorsConfigXML",
     "cmd:cmd:method:BucketMetadataSys.GetLifecycleConfig",
     "cmd:cmd:method:BucketMetadataSys.GetNotificationConfig",
     "cmd:cmd:method:BucketMetadataSys.GetObjectLockConfig",
@@ -5872,6 +5878,23 @@
     "internal/bucket/bandwidth:bandwidth:type:MonitorReaderOptions",
     "internal/bucket/bandwidth:bandwidth:type:MonitoredReader",
     "internal/bucket/bandwidth:bandwidth:type:SelectionFunction",
+    "internal/bucket/cors:cors:field:Config.CORSRules",
+    "internal/bucket/cors:cors:field:Config.XMLName",
+    "internal/bucket/cors:cors:field:Rule.AllowedHeaders",
+    "internal/bucket/cors:cors:field:Rule.AllowedMethods",
+    "internal/bucket/cors:cors:field:Rule.AllowedOrigins",
+    "internal/bucket/cors:cors:field:Rule.ExposeHeaders",
+    "internal/bucket/cors:cors:field:Rule.ID",
+    "internal/bucket/cors:cors:field:Rule.MaxAgeSeconds",
+    "internal/bucket/cors:cors:func:ParseBucketCorsConfig",
+    "internal/bucket/cors:cors:method:Config.MatchPreflight",
+    "internal/bucket/cors:cors:method:Config.MatchRule",
+    "internal/bucket/cors:cors:method:Config.Validate",
+    "internal/bucket/cors:cors:method:Rule.FilterAllowedHeaders",
+    "internal/bucket/cors:cors:method:Rule.HasAllowedMethod",
+    "internal/bucket/cors:cors:method:Rule.HasAllowedOrigin",
+    "internal/bucket/cors:cors:type:Config",
+    "internal/bucket/cors:cors:type:Rule",
     "internal/bucket/encryption:sse:const:AES256",
     "internal/bucket/encryption:sse:const:AWSKms",
     "internal/bucket/encryption:sse:field:ApplyOptions.AutoEncrypt",
diff --git a/internal/bucket/cors/cors_test.go b/internal/bucket/cors/cors_test.go
index a77745b3f..3c02c14db 100644
--- a/internal/bucket/cors/cors_test.go
+++ b/internal/bucket/cors/cors_test.go
@@ -53,10 +53,10 @@ func TestParseAndValidate(t *testing.T) {
 
 func TestValidateRejections(t *testing.T) {
 	cases := map[string]string{
-		"bad method":    `<CORSConfiguration><CORSRule><AllowedOrigin>*</AllowedOrigin><AllowedMethod>TRACE</AllowedMethod></CORSRule></CORSConfiguration>`,
-		"no origin":     `<CORSConfiguration><CORSRule><AllowedMethod>GET</AllowedMethod></CORSRule></CORSConfiguration>`,
-		"no method":     `<CORSConfiguration><CORSRule><AllowedOrigin>*</AllowedOrigin></CORSRule></CORSConfiguration>`,
-		"negative age":  `<CORSConfiguration><CORSRule><AllowedOrigin>*</AllowedOrigin><AllowedMethod>GET</AllowedMethod><MaxAgeSeconds>-1</MaxAgeSeconds></CORSRule></CORSConfiguration>`,
+		"bad method":   `<CORSConfiguration><CORSRule><AllowedOrigin>*</AllowedOrigin><AllowedMethod>TRACE</AllowedMethod></CORSRule></CORSConfiguration>`,
+		"no origin":    `<CORSConfiguration><CORSRule><AllowedMethod>GET</AllowedMethod></CORSRule></CORSConfiguration>`,
+		"no method":    `<CORSConfiguration><CORSRule><AllowedOrigin>*</AllowedOrigin></CORSRule></CORSConfiguration>`,
+		"negative age": `<CORSConfiguration><CORSRule><AllowedOrigin>*</AllowedOrigin><AllowedMethod>GET</AllowedMethod><MaxAgeSeconds>-1</MaxAgeSeconds></CORSRule></CORSConfiguration>`,
 	}
 	for name, doc := range cases {
 		c, err := ParseBucketCorsConfig(strings.NewReader(doc))