Merge "Sanitize transactions in SSG" into udc-dev