Update to reflect latest spring-sync snapshot