Merge "Fixes metrics collection in RRMS." into sc-dev