Further merges from remove-spring-jpa branch