fix for dna with debug
Merge remote-tracking branch 'upstream/master'
hunt fix