Merge #14821 with fixes

Add some simple lint fixes