`release/1.15.x`: Backport of #1161#1194

austinvalle merged 1 commit intorelease/1.15.xhashicorp/terraform-plugin-framework:release/1.15.xfrom

av/backport-1161hashicorp/terraform-plugin-framework:av/backport-1161Copy head branch name to clipboard