Fixes for custom conf file
Multiprovider changes
Merge remote-tracking branch 'origin/master'