Merge "provider manager"