Merge #17136

Merge #17136 with fixes