
Automatic merge from submit-queue (batch tested with PRs 41043, 39058, 41021, 41603, 41414) Allow setting replace patchStrategy for structs **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #20208 @liggitt and @ymqytw ptal, you were in the original issue