Fixes lint errors
Merge pull request #5141 from yurydelendik/master

Fixes lint errors