Cherry pick #5425

20210820-183735-zhewu_5435-b87b9ee603373a92 compressed=True data_size=24100427 duration=5058371 ended=100809 fail_fast=10 max_runs=100000 pass=100268 priority=100 remaining=0 runtime=1:05:41 sanity=False started=100809 stopped=20210820-194316 submitted=20210820-183735 timeout=5400 username=zhewu_5435

Code-Reviewer Section

The general guidelines can be found here.

Please check each of the following things and check all boxes before accepting a PR.

• The PR has a description, explaining both the problem and the solution.
• The description mentions which forms of testing were done and the testing seems reasonable.
• Every function/class/actor that was touched is reasonably well documented.

For Release-Branches

If this PR is made against a release-branch, please also check the following:

• This change/bugfix is a cherry-pick from the next younger branch (younger release-branch or master if this is the youngest branch)
• There is a good reason why this PR needs to go into a release branch and this reason is documented (either in the description above or in a linked GitHub issue)