CSIT-1097: Migrate L2 to NDRPDR and edit MRR