Merge branch '2.7.x'

Author: philwebb

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindConverter.java

@@ -42,6 +42,7 @@
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.ConditionalGenericConverter;
 import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
 
 /**
@@ -107,7 +108,7 @@ private Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor
 			try {
 				if (delegate.canConvert(sourceType, targetType)) {
 					Object converted = delegate.convert(source, sourceType, targetType);
-					if (targetType.getType().isInstance(converted)) {
+					if (ClassUtils.isAssignableValue(targetType.getType(), converted)) {
 						return converted;
 					}
 				}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/WithPublicObjectToObjectMethod.java

@@ -40,4 +40,4 @@ public static Optional<WithPublicObjectToObjectMethod> from(String value) {
 		return Optional.of(new WithPublicObjectToObjectMethod(value));
 	}
 
-}
+}