Merged TrackerFlexSim from repository AndrewLevin