Merge "Cleaned up transaction sanitize calls" into udc-dev