1.x: Feature/factory rebase