Tried to get the provider menu back
Merge remote-tracking branch 'origin' into release