Follow the coding conventions
Merge pull request #17596 from aderyabin/follow_convension

Follow the coding conventions