Username change is in effect only after restart
Users can no longer select objects of different types for joining
Merge branch 'master' into client