diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java b/org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
index f6fb83bce86..ec31ba448e2 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
@@ -187,17 +187,22 @@ public class GenericConversionService implements ConversionService, ConverterReg
 		addGenericConverter(Object[].class, Collection.class, new ArrayToCollectionGenericConverter(this));
 		addGenericConverter(Object[].class, String.class, new ArrayToStringGenericConverter(this));
 		addGenericConverter(Object[].class, Object.class, new ArrayToObjectGenericConverter(this));
+		// TODO Collection->Map
 		addGenericConverter(Collection.class, Collection.class, new CollectionToCollectionGenericConverter(this));
 		addGenericConverter(Collection.class, Object[].class, new CollectionToArrayGenericConverter(this));
 		addGenericConverter(Collection.class, String.class, new CollectionToStringGenericConverter(this));
 		addGenericConverter(Collection.class, Object.class, new CollectionToObjectGenericConverter(this));
 		addGenericConverter(Map.class, Map.class, new MapToMapGenericConverter(this));
 		addGenericConverter(Map.class, String[].class, new MapToStringArrayGenericConverter(this));
+		// TODO Map->Collection
+		// TODO Map->String
+		// TODO Map->Object
 		addGenericConverter(String.class, Object[].class, new StringToArrayGenericConverter(this));
 		addGenericConverter(String.class, Collection.class, new StringToCollectionGenericConverter(this));
 		addGenericConverter(String.class, Map.class, new StringToMapGenericConverter(this));
 		addGenericConverter(Object.class, Object[].class, new ObjectToArrayGenericConverter(this));
 		addGenericConverter(Object.class, Collection.class, new ObjectToCollectionGenericConverter(this));
+		// TODO Object->Map
 	}
 
 	/**