Оптимизации и рефакторинг кода
Merge branch 'bugfixes/refactor' into develop
Merge branch 'develop'