Merge pull request #3942 from github/backport-v3.36.1-87557b9c8 #3801

Job	Run time
Upload debug artifacts (linked)	5m 33s
Upload debug artifacts (stable-v2.20.3)	5m 58s
Upload debug artifacts (default)	6m 34s
Upload debug artifacts (nightly-latest)	5m 35s
Download and check debug artifacts	6s
	23m 46s

Provide feedback