Merge StopFinder changes into local develop