CONTRIB-5135 PostgreSQL compatibility