OZP-476: Add flag to opt-in to sync