diff --git a/pom.xml b/pom.xml
index cdd68fe2d4..36d1f15170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-commons</artifactId>
-	<version>3.5.0-SNAPSHOT</version>
+	<version>3.5.0-qbe-documentation-SNAPSHOT</version>
 
 	<name>Spring Data Core</name>
 	<description>Core Spring concepts underpinning every Spring Data module.</description>
diff --git a/src/main/antora/modules/ROOT/pages/query-by-example.adoc b/src/main/antora/modules/ROOT/pages/query-by-example.adoc
index f3f27cb8cd..45590079c2 100644
--- a/src/main/antora/modules/ROOT/pages/query-by-example.adoc
+++ b/src/main/antora/modules/ROOT/pages/query-by-example.adoc
@@ -1,3 +1,7 @@
+ifndef::support-qbe-collection[]
+:support-qbe-collection: true
+endif::[]
+
 [[query-by-example]]
 = Query by Example
 
@@ -36,6 +40,9 @@ Query by Example is well suited for several use cases:
 Query by Example also has several limitations:
 
 * No support for nested or grouped property constraints, such as `firstname = ?0 or (firstname = ?1 and lastname = ?2)`.
+ifeval::[{support-qbe-collection} != true]
+* No support for matching collections or maps.
+endif::[]
 * Store-specific support on string matching.
 Depending on your databases, String matching can support starts/contains/ends/regex for strings.
 * Exact matching for other property types.