Merge branch 'dev_db_config' into 'dev'

Version 3.18.2

See merge request !39
1 job for dev in 2 minutes and 5 seconds (queued for 2 seconds)