Merge #18944

Merge #18944