CLDIDE-1758; find factory method added;