Fix the version check when no database exists
Merge remote-tracking branch 'ms/development' into development-custom