Added color matching to metrics for issue #1753
Merge branch 'develop' into feature-reporting
Merge branch 'develop' into feature-reporting
Merge branch 'develop' into feature-reporting
Updated Version