Merge "Descriptor Unification"