diff --git a/spring-data-rest-core/pom.xml b/spring-data-rest-core/pom.xml
index 011968214..6347bb7c2 100644
--- a/spring-data-rest-core/pom.xml
+++ b/spring-data-rest-core/pom.xml
@@ -16,7 +16,7 @@
 	</parent>
 
 	<properties>
-		<spring.hateoas>0.18.0.RELEASE</spring.hateoas>
+		<spring.hateoas>0.19.0.BUILD-SNAPSHOT</spring.hateoas>
 		<springplugin>1.2.0.RELEASE</springplugin>
 		<evoinflector>1.2.1</evoinflector>
 	</properties>
diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java
index e3c6f51ce..a63f01907 100644
--- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java
+++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java
@@ -477,7 +477,8 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
 
 		RelProvider defaultedRelProvider = this.relProvider != null ? this.relProvider : new EvoInflectorRelProvider();
 
-		HalHandlerInstantiator instantiator = new HalHandlerInstantiator(defaultedRelProvider, curieProvider);
+		HalHandlerInstantiator instantiator = new HalHandlerInstantiator(defaultedRelProvider, curieProvider,
+				resourceDescriptionMessageSourceAccessor());
 
 		ObjectMapper mapper = basicObjectMapper();
 		mapper.registerModule(persistentEntityJackson2Module());
diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverterUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverterUnitTests.java
index b3bc1dfd3..936e2ece4 100644
--- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverterUnitTests.java
+++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverterUnitTests.java
@@ -58,7 +58,7 @@ import com.jayway.jsonpath.JsonPath;
 @ContextConfiguration(classes = { MongoDbRepositoryConfig.class, TestConfiguration.class })
 public class PersistentEntityToJsonSchemaConverterUnitTests {
 
-	@Autowired MessageSourceAccessor accessor;
+	@Autowired @Qualifier("resourceDescriptionMessageSourceAccessor") MessageSourceAccessor accessor;
 	@Autowired RepositoryResourceMappings mappings;
 	@Autowired RepositoryRestConfiguration configuration;
 	@Autowired PersistentEntities entities;
diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/ProjectionJacksonIntegrationTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/ProjectionJacksonIntegrationTests.java
index b41add6db..94700b5b7 100644
--- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/ProjectionJacksonIntegrationTests.java
+++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/ProjectionJacksonIntegrationTests.java
@@ -48,7 +48,7 @@ public class ProjectionJacksonIntegrationTests {
 
 		this.mapper = new ObjectMapper();
 		this.mapper.registerModule(new Jackson2HalModule());
-		this.mapper.setHandlerInstantiator(new HalHandlerInstantiator(new EvoInflectorRelProvider(), null));
+		this.mapper.setHandlerInstantiator(new HalHandlerInstantiator(new EvoInflectorRelProvider(), null, null));
 	}
 
 	/**
@@ -76,7 +76,8 @@ public class ProjectionJacksonIntegrationTests {
 
 		ObjectMapper mapper = new ObjectMapper();
 		mapper.registerModule(new Jackson2HalModule());
-		mapper.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(new EvoInflectorRelProvider(), null));
+		mapper.setHandlerInstantiator(
+				new Jackson2HalModule.HalHandlerInstantiator(new EvoInflectorRelProvider(), null, null));
 
 		Customer customer = new Customer();
 		customer.firstname = "Dave";
diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/RepositoryTestsConfig.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/RepositoryTestsConfig.java
index 0cbe072e2..4b9a5fd97 100644
--- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/RepositoryTestsConfig.java
+++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/RepositoryTestsConfig.java
@@ -109,8 +109,8 @@ public class RepositoryTestsConfig {
 				mock(PagingAndSortingTemplateVariables.class),
 				OrderAwarePluginRegistry.<Class<?>, BackendIdConverter> create(Arrays.asList(DefaultIdConverter.INSTANCE)));
 
-		return new PersistentEntityJackson2Module(mappings, persistentEntities(), config(), new UriToEntityConverter(
-				persistentEntities(), defaultConversionService()), entityLinks);
+		return new PersistentEntityJackson2Module(mappings, persistentEntities(), config(),
+				new UriToEntityConverter(persistentEntities(), defaultConversionService()), entityLinks);
 	}
 
 	@Bean
@@ -121,7 +121,7 @@ public class RepositoryTestsConfig {
 
 		mapper.registerModule(new Jackson2HalModule());
 		mapper.registerModule(persistentEntityModule());
-		mapper.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(relProvider, null));
+		mapper.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(relProvider, null, null));
 		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 		mapper.setSerializationInclusion(Include.NON_EMPTY);