Merge #16906 with fixes

Just lint
Merge #16906