Merging from latest spring-data