Merge #16338

Merge #16338 with lint fixes