Fixes lint regressions from d6b57e8e0218ead
Merge pull request #1599 from yurydelendik/master

Fixes lint regressions from d6b57e8e0218ead