Merge #18079

Merge #18079