Merge "Add functest in upper-constraints"