* backport of commit 0d7bee8adc
* backport of commit 408cbe8ae0
* backport of commit a0854784dc
* backport of commit 71c4c6564f
* backport of commit 0c060fa2ba
---------
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Co-authored-by: David Yu <dyu@hashicorp.com>