Merge "Fix bug: metricIds are truncated"