[#706] [#2324] Merged fix for postgres integration test