* backport of commit 8aef67766926213f0b0e3f2d733aa987e630cdc4

* backport of commit 7fe721670e53bcc153092591a973be8d7e2b0528

* backport of commit 9b1cca294fb47db904a0480364d44ac8362ca187
Co-authored-by: Stephen Wayne <swayne@hashicorp.com>