* backport of commit 97c779b5a2308a05fde93247209fa6e9cd3fc310 * backport of commit dd56a6800bebc54dabd7883fddc22b25ca2bdb92 --------- Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>