Implement tracker in html base template
Merge branch 'hotfix/tracking_final'