CLDIDE-2164 Implemented factory 2.1