Merge "Descriptor Unification"

No match.