fixed
Merge branch 'refs/heads/hotfix-ticker' into develop