Merge branch 'release/0.6.0-beta'
Fixed bug when using track alternatives
Merge branch 'hotfix/0.6.1-beta' into develop