Merge "[CPS] Use common postgres for CPS"