Merge "Add generic Postgres set for DCAE"