Backport of https://github.com/hashicorp/boundary/pull/5027 onto release/0.16.x

Backport of https://github.com/hashicorp/boundary/pull/5027 onto release/0.16.x #12990