Merge "Ensure that the pip transaction matrix has only scale & rotation info" into sc-dev