get rid of erasure warnings
Merge branch 'additional_oids' into thefactory