Merge "Return to direct mutation for Provider authority"