CS fixes
Merge branch 'user' into permission