diff --git a/wp-includes/class-wp-connector-registry.php b/wp-includes/class-wp-connector-registry.php
index a5ad473206..a4bd8fb48f 100644
--- a/wp-includes/class-wp-connector-registry.php
+++ b/wp-includes/class-wp-connector-registry.php
@@ -192,7 +192,11 @@ final class WP_Connector_Registry {
 			if ( ! empty( $args['authentication']['credentials_url'] ) && is_string( $args['authentication']['credentials_url'] ) ) {
 				$connector['authentication']['credentials_url'] = $args['authentication']['credentials_url'];
 			}
-			$connector['authentication']['setting_name'] = 'connectors_ai_' . str_replace( '-', '_', $id ) . '_api_key';
+			if ( ! empty( $args['authentication']['setting_name'] ) && is_string( $args['authentication']['setting_name'] ) ) {
+				$connector['authentication']['setting_name'] = $args['authentication']['setting_name'];
+			} else {
+				$connector['authentication']['setting_name'] = 'connectors_ai_' . str_replace( '-', '_', $id ) . '_api_key';
+			}
 		}
 
 		if ( ! empty( $args['plugin'] ) && is_array( $args['plugin'] ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cfccaa9d49..6e6b68a89b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '7.0-RC1-62115';
+$wp_version = '7.0-RC1-62116';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.