diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
index f52efa84e6..51adc7cb2d 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
@@ -19,6 +19,7 @@
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
@@ -96,7 +97,7 @@ protected RepositoryFactorySupport doCreateRepositoryFactory() {
 	}
 
 	@Autowired
-	public void setMappingContext(RelationalMappingContext mappingContext) {
+	public void setMappingContext(@Qualifier("jdbcMappingContext") RelationalMappingContext mappingContext) {
 
 		Assert.notNull(mappingContext, "MappingContext must not be null");
 
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index 64e438568d..c3d360e056 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,4 +1,4 @@
-Spring Data JDBC 2.3 GA (2021.1.0)
+Spring Data JDBC 2.4 M2 (2021.2.0)
 Copyright (c) [2017-2019] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -29,6 +29,8 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+
+