Merge branch 'db_default'