Merge branch 'UpgradedTrackFinder'