Second step to local database support
Merge remote-tracking branch 'origin/master'