Merge "Correct cleanup when compacting metrics attributes" into oc-mr1-dev