Optionally require mdm, as well

MSP-11412