Merge the improved xdev logic from master