Merge #17237

Merge #17237 
Fix lint and and don't remove the force option