VID-1912 Added tracking
VID-1912 Code review fixes
Merge pull request #4514 from Wikia/VID-1912

VID-1912 Added tracking