Merge "Surface should be Sync too." into main