Merge "Fix the format of getting upper-constraints"