[Master] Drop in DT replacement