Merge #18196 with fixes

Merge #18196 with fixes
Some minor lint stuff