Merge #18840

Merge #18840