XDEV updates for master

Updates for XDEV builds