[openFATE 319432] Improve the default DM selection beahvior of xdm