Merge "Fix test failure" into sc-v2-dev