Merge "Fix CombinationKeyTests failure" into udc-dev