Merge "Implement UserTracker"