text was edited
Merge branch 'Palagniuk.Oleg'