minor db settings
Regular merge