Preparing for full postgres merge.