Updating also the default database in the Preferences
Merge remote-tracking branch 'origin/androdi-l-dev' into androdi-l-dev