fix UserSwitching
Merge branch 'develop'