Merge "Avoid unnecessary dup" into sc-v2-dev