Update to match latest spring-sync snapshots