Able to change user using attribute
Merge branch 'user' into develop