CLDIDE-1680: make some changes in factory versioning stratagy