Merge branch 'hotfix/speed_1'
counter
Merge branch 'hotfix/counter' into develop