Merge "Update in provider manager"