Merge "Temporary fix for both normal tracks & fast tracks" into jb-dev