More "LESS" to "Less" changes
Merge pull request #12302 from Quy/master

More "LESS" to "Less" changes