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