Merge "Upgrade upper-constraints"