Fix Identity parsing in SwitchboardController
Remove import
Merge branch 'master' into fix-switchboard
Merge branch 'fix-switchboard'