Merge pull request #4700 from eval-exec/exec/generate-default-db-options

Merge pull request #4700 from eval-exec/exec/generate-default-db-options #6285