Merge #17143

Merge #17143 with fixes