DF-1687 changed in correspondance with code style agreements