Merge "Update owner"