* backport of commit 06507fe053f8777b12c8a0a54e062df1fb111a52
* backport of commit 14e160573dbc9d644cb045af7eda5da0d03447d0
* backport of commit 088ec70f902e79a101669fbb76830fe356b23982
---------
Co-authored-by: Jared Kirschner <85913323+jkirschner-hashicorp@users.noreply.github.com>