Merge #17139 with lint fixes

Merge #17139 with lint fixes