Make changes needed to work with consolidation of d2 device wherever possible