Multiple providers - respect firewall's provider #54
Fix merge conflicts with master
Merge branch 'feature/multiple_providers'