Merge branch 'hotfix/v210bugs_more'
Fixed tracks that wouldn’t finish loading when empty.
Merge branch 'hotfix/210bugs' into develop