Cherry pick #37257 and #37294 into release-2.71 #37307

claudevdm merged 2 commits intoapache:release-2.71apache/beam:release-2.71from

claudevdm:cp-37257_37294claudevdm/beam:cp-37257_37294Copy head branch name to clipboard