Merge "[OOM] Bump postgresql version"