I only fixed the problem in Cluster tool. But the fix might fix some similar problems.
For Metric tool, how did you reproduce this? So that I can check.