Cherry-pick #38488 and #38500 into release branch#38503

Amar3tto merged 2 commits into

apache:release-2.74apache/beam:release-2.74from

Abacn:cpAbacn/beam:cpCopy head branch name to clipboard