Merge #17225

Merge #17225