backport: #4027#4053

nelson-parente wants to merge 1 commit intodapr:release-1.16dapr/components-contrib:release-1.16from

nelson-parente:backport/pr-4027nelson-parente/components-contrib:backport/pr-4027Copy head branch name to clipboard