Merge "Move Sync to base class" into main