Merge branch 'devel_16.1.x' into 'devel_16.2.x'

Postgres compatibility

See merge request !1495
45 jobs for devel_16.2.x in 19 minutes and 5 seconds (queued for 7 seconds)