Merge branch 'hotfix/fix_counts'
Fixed custom tracks
Merge branch 'hotfix/fix_hover_on_tooltip' into develop