updated TrackObject for switches
Merge origin/master