switched X to D for detectors
Merge remote-tracking branch 'upstream/master'