Added the additional tracking property just for the preview bar.
Merge branch 'master' into production