Merge #17169

Merge #17169 with minor fix