Added the ability to disable the detailed DW metrics
Merge remote-tracking branch 'origin/master'