Merge pull request #1991 from vkeranov/develop

Let's follow the style guide...