Data dir created on login creation
Merge remote-tracking branch 'origin/master'