Изменения конфига
Merge branch 'master' into develop