Merge "Avatar sync functionality" into main