Merge changes from spring-projects