Merge "Support upsert"