Changes to support RDS for GCE