* backport of commit a4f77878e74d5f4f5c737554ee0b7ebf15ae6872 * backport of commit 29da4339bff6a7d2269551f9e7d63d65b2575eea --------- Co-authored-by: Semir Patel <semir.patel@hashicorp.com>