Merge "Manual sync should be set"