Improve how pinned providers are handled
Merge remote-tracking branch 'chiiph/feature/improve_pinned_providers' into develop