UserDto configurable update1
Merge remote-tracking branch 'origin/master' into copy_master