Merge "MBB: Add metrics" into sc-dev