Merge pull request #20763 from commodo/stress-ng