Merge #18631 with fixes

Merge #18631 with fixes