MDF2 PR comments changes