Adds tracking
Merge branch 'hotfix/tracking'