Merge "Report mock measurements consistent with SvInfo" into main