Merge "Fix sync update flow"