Update to latest DMF and DMR