Merge "Remove exception and drop cloned tables in PostgresSQL too"