Merge branch '64_fix_database_simple_v2' into 'master'

Fix simple/2 database code

See merge request !68
3 jobs for master in 28 minutes and 12 seconds (queued for 3 seconds)