Added color matching to metrics for issue #1753