this is cleaner
Merge branch 'additional_oids' into thefactory