update valencia via cherrypick and resolve