Merge "Fix PostgreSQL patch-add-3d.sql by replacing it"