CSIT-1097: Migrate ip4 to NDRPDR and edit MRR