diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
index 67ef3a3081..7eb7d10e34 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
@@ -569,6 +569,7 @@ protected void executeQuery(Query query, String collectionName, DocumentCallback
 
 		if (LOGGER.isDebugEnabled()) {
 			LOGGER.debug(String.format("Executing query: %s fields: %s sort: %s in collection: %s",
+					// TBD: move serializeToJsonSafely() to "XXXDelegate" class and make this class a spring managed bean for user customization
 					serializeToJsonSafely(queryObject), fieldsObject, serializeToJsonSafely(sortObject), collectionName));
 		}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
index 11e0f7fb24..82505e98db 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
@@ -110,6 +110,7 @@ private static void toFlatMap(String currentPath, Object source, Map<String, Obj
 	 * @param value
 	 * @return the serialized value or {@literal null}.
 	 */
+	// TBD: add serializeToJsonSafely(@Nullable Document document, JsonWriterSettings settings) {}
 	@Nullable
 	public static String serializeToJsonSafely(@Nullable Object value) {