Merge branch 'timofeimih-feature'
Сляние с конфликами
Merge branch 'master' into feature