Merge "Fix incorrect pos / id for privacy dot" into sc-v2-dev