Merge "Erase additional providers if no primary provider" into main