Merge #15458 with lint fix

Merge #15458 with lint fix