CLDIDE-2171

 @skabashnyuk @evoevodin @garagatyi
Please, make code formatting in master with appropriate message in the future. Separation code formatting from code changing will allow us to verify formatting and code changes easier.