UserManager update
Merge branch 'job'