merge #16933

Merge #16933 with lint fixes