KDTree Support; #1936