BUGFIX: copy-paste error in Factory
Merge remote-tracking branch 'origin/alex' into roland