Merge "Fix fast track leak if out of normal track names" into jb-dev