Updated d-t-m to 6a6fcf1bd (shoot-first-1 branch)
Follow d-t-m api changes