diff --git a/.changelog/9553.txt b/.changelog/9553.txt
new file mode 100644
index 0000000000..8ec013c069
--- /dev/null
+++ b/.changelog/9553.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google-beta/services/identityplatform/resource_identity_platform_project_default_config.go b/google-beta/services/identityplatform/resource_identity_platform_project_default_config.go
index 4c85a09b92..319f46b4a2 100644
--- a/google-beta/services/identityplatform/resource_identity_platform_project_default_config.go
+++ b/google-beta/services/identityplatform/resource_identity_platform_project_default_config.go
@@ -52,9 +52,7 @@ func ResourceIdentityPlatformProjectDefaultConfig() *schema.Resource {
 			tpgresource.DefaultProviderProject,
 		),
 
-		DeprecationMessage: "Deprecated. Use the `google_identity_platform_config` resource instead. " +
-			"It contains a more comprehensive list of fields, and was created before " +
-			"`google_identity_platform_project_default_config` was added.",
+		DeprecationMessage: "`google_identity_platform_config` is deprecated and will be removed in the next major release of the provider. Use the `google_identity_platform_config` resource instead. It contains a more comprehensive list of fields, and was created before `google_identity_platform_project_default_config` was added.",
 
 		Schema: map[string]*schema.Schema{
 			"sign_in": {
diff --git a/google-beta/services/secretmanager/resource_secret_manager_secret_version.go b/google-beta/services/secretmanager/resource_secret_manager_secret_version.go
index 42f582a5e6..48d7cb020e 100644
--- a/google-beta/services/secretmanager/resource_secret_manager_secret_version.go
+++ b/google-beta/services/secretmanager/resource_secret_manager_secret_version.go
@@ -34,21 +34,11 @@ import (
 	"google.golang.org/api/googleapi"
 )
 
-func resourceSecretManagerSecretVersionUpdate(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*transport_tpg.Config)
-
-	_, err := expandSecretManagerSecretVersionEnabled(d.Get("enabled"), d, config)
-	if err != nil {
-		return err
-	}
-
-	return resourceSecretManagerSecretVersionRead(d, meta)
-}
-
 func ResourceSecretManagerSecretVersion() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceSecretManagerSecretVersionCreate,
 		Read:   resourceSecretManagerSecretVersionRead,
+		Update: resourceSecretManagerSecretVersionUpdate,
 		Delete: resourceSecretManagerSecretVersionDelete,
 
 		Importer: &schema.ResourceImporter{
@@ -57,11 +47,10 @@ func ResourceSecretManagerSecretVersion() *schema.Resource {
 
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(20 * time.Minute),
+			Update: schema.DefaultTimeout(20 * time.Minute),
 			Delete: schema.DefaultTimeout(20 * time.Minute),
 		},
 
-		Update: resourceSecretManagerSecretVersionUpdate,
-
 		Schema: map[string]*schema.Schema{
 			"secret_data": {
 				Type:        schema.TypeString,
@@ -294,6 +283,16 @@ func resourceSecretManagerSecretVersionRead(d *schema.ResourceData, meta interfa
 	return nil
 }
 
+func resourceSecretManagerSecretVersionUpdate(d *schema.ResourceData, meta interface{}) error {
+	config := meta.(*transport_tpg.Config)
+	_, err := expandSecretManagerSecretVersionEnabled(d.Get("enabled"), d, config)
+	if err != nil {
+		return err
+	}
+
+	return resourceSecretManagerSecretVersionRead(d, meta)
+}
+
 func resourceSecretManagerSecretVersionDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*transport_tpg.Config)
 	userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)
diff --git a/website/docs/r/identity_platform_project_default_config.html.markdown b/website/docs/r/identity_platform_project_default_config.html.markdown
index 415d38b816..a9f336fbc6 100644
--- a/website/docs/r/identity_platform_project_default_config.html.markdown
+++ b/website/docs/r/identity_platform_project_default_config.html.markdown
@@ -18,6 +18,7 @@ description: |-
 ---
 
 # google\_identity\_platform\_project\_default\_config
+~> **Warning:** `google_identity_platform_config` is deprecated and will be removed in the next major release of the provider. Use the `google_identity_platform_config` resource instead. It contains a more comprehensive list of fields, and was created before `google_identity_platform_project_default_config` was added.
 
 There is no persistent data associated with this resource.
 
diff --git a/website/docs/r/secret_manager_secret_version.html.markdown b/website/docs/r/secret_manager_secret_version.html.markdown
index 1d93f5a603..555efee3c9 100644
--- a/website/docs/r/secret_manager_secret_version.html.markdown
+++ b/website/docs/r/secret_manager_secret_version.html.markdown
@@ -197,6 +197,7 @@ This resource provides the following
 [Timeouts](https://developer.hashicorp.com/terraform/plugin/sdkv2/resources/retries-and-customizable-timeouts) configuration options:
 
 - `create` - Default is 20 minutes.
+- `update` - Default is 20 minutes.
 - `delete` - Default is 20 minutes.
 
 ## Import