Merg in ATD-debug changes