* backport of commit 189786c0232009b6232713e8fe98c50654e68b46 * backport of commit fceeebd3ae85db510a5cdcf0cd8288bbacf2f59e --------- Co-authored-by: David Yu <dyu@hashicorp.com>