Updating Metrics
Correcting metrics typo
Checking for null color value before restoring collar color, bug 407:resolved
Merge branch '1.4'
Merging block id/json work