* backport of commit 63e87434721824902d1bd8c7ef72456615020180 * backport of commit 896f11789b89062c745433a17dc37da5b56185fd --------- Co-authored-by: Andrew Stucki <andrew.stucki@hashicorp.com>