Merge "Add StateTracker classes"