Ingest and transformation fixes.
Merge branch 'master' into development