Merge "[incremental] expose more metrics fields" into sc-dev