Allow to switch user in the dev env
Merge remote-tracking branch 'origin/master'