Merge branch 'hotfix-2.2.4'
DAISY SCHOOL MOSCOW
Merge branch 'hotfix-2.2.5' into develop