Merge "New metrics fields for selection logs" into oc-mr1-dev