Patch suite based on the new NAT API.
