Merge "Fix a security issue" into sc-v2-dev