Merge #18953 with lint fixes

Merge #18953 with lint fixes