Extra paranoid time
Merge branch 'getty-ingest-fixes' into stage