Address review comments for #3899 #3620

Job	Run time
Upload debug artifacts (default)	5m 59s
Upload debug artifacts (linked)	6m 7s
Upload debug artifacts (stable-v2.20.3)	5m 47s
Upload debug artifacts (nightly-latest)	5m 36s
Download and check debug artifacts	8s
	23m 37s

Provide feedback