Merge branch 'fix-HIC-98' into 'master'

Fix  tests that fail when with Postgres database

See merge request !10