Merge "Fix loop issue in IPANAT table"