Merge "Fixed Handler Leak on DistanceClassifier"