Users are now visible again in the app1 part
Merge remote-tracking branch 'origin/master'