MLHR-650 #resolve
Merge pull request #630 from andyperlitch/switch_metrics.MLHR-650

MLHR-650 #resolve