Fix for issue causing issues loading and saving search providers
Merge branch 'origin/dev'