Merge #18555

Merge #18555