Backport of Merge pull request #5288 from hashicorp/NET-3648_fix into release/1.15.x#17165

Merged

NiniOak merged 2 commits intorelease/1.15.xfrom backport/cp_NET-3648_part2/genuinely-civil-toucan

Apr 27, 2023

Commits on Apr 27, 2023