Merge branch 'feature-rename-table-city' into develop
Merge branch 'hotfix-stat'
7
Merge branch 'hotfix-stat'