non multiprovider mode implementation in 3rd level domains only
Merge branch 'non-multiprovider'