Merge #17142 with fixes

Merge #17142 with fixes