Merge "Fixed failing scrim test" into sc-v2-dev