Add tracking code validation
Merge branch 'develop'