8010209: Better provision of factories

Reviewed-by: dcubed, ahgross
2 files changed