Merge "Privacy chip (3/many)" into sc-dev