Merge "Remove Descriptor proxy field from individual effect" into udc-dev