Backport 2156 to release/0.4.z#2298

jcrossley3 wants to merge 2 commits into

guacsec:release/0.4.zguacsec/trustify:release/0.4.zfrom

jcrossley3:backport-2156-to-release/0.4.zjcrossley3/trustify:backport-2156-to-release/0.4.zCopy head branch name to clipboard