Merge branch 'chore/improve-database-config-docs' into 'develop'