* backport of commit 01ca961e

* backport of commit e71ae3ae



---------

Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>