Merge "IPANAT: fix IPANAT deletion issue"