Merge "additional fix fro BUG-782 unregistering switch providers"