Merge branch '6.2.x'

# Conflicts:
#	spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java

spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java

@@ -581,6 +581,18 @@ class GenericConversionServiceTests {
 		assertThat(bList).allMatch(e -> e instanceof BRaw);
 	}
 
+	@Test
+	void stringToListOfMapConverterWithFallbackMatch() {
+		conversionService.addConverter(new StringToListOfMapConverter());
+
+		List<Map<String, Object>> result = (List<Map<String, Object>>) conversionService.convert("foo",
+				TypeDescriptor.valueOf(String.class),
+				TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Map.class))
+		);
+
+		assertThat("foo").isEqualTo(result.get(0).get("bar"));
+	}
+
 
 	@ExampleAnnotation(active = true)
 	public String annotatedString;
@@ -969,4 +981,13 @@ class GenericConversionServiceTests {
 		}
 	}
 
+
+	private static class StringToListOfMapConverter implements Converter<String, List<? extends Map<String, ?>>> {
+
+		@Override
+		public List<? extends Map<String, ?>> convert(String source) {
+			return List.of(Map.of("bar", source));
+		}
+	}
+
 }