Merge branch 'spring-update'